add stack first version (without tests)

Author: uvicorn

markov_strings/Makefile

@@ -1,7 +1,7 @@
 CC=g++
 INCLUDE_DIR = include
 # CFLAGS = -lm -I $(INCLUDE_DIR)
-CFLAGS=-Wall -Wextra -Wpedantic  -I $(INCLUDE_DIR) -fpermissive -DDEBUG
+CFLAGS=-Wall -Wextra -Wpedantic  -I $(INCLUDE_DIR) -fpermissive -O2 -DDEBUG
 #-fsanitize=address -Og -DDEBUG -ggdb -D_FORTIFY_SOURCE=2 -lgtest -fpermissive -lstdc++
 TEST_CFLAGS=-Wall -Wextra -Wpedantic -lm  -I $(INCLUDE_DIR)
 LDFLAGS=$(CFLAGS)

markov_strings/src/sort.c

@@ -10,16 +10,19 @@
 
 const char* special_symbols = " \n[](){}!?.,:;/*&^%$_+-–—=<>@|~";
 
+inline void pass_special_symbols(char **a, char**b, int step){
+    while (strchr(special_symbols, **a) && **a) *a += step;
+    while (strchr(special_symbols, **b) && **b) *b += step;
+}
+
 int forward_string_comparator(const void* arg1, const void* arg2){
     const char* a = (*(string*)arg1).start;
     const char* b = (*(string*)arg2).start;
 
-    while (strchr(special_symbols, *a) && *a) a++;
-    while (strchr(special_symbols, *b) && *b) b++;
+    pass_special_symbols(&a, &b, +1);
 
     while (*a && (*a++ == *b++)){
-        while (strchr(special_symbols, *a) && *a) a++;
-        while (strchr(special_symbols, *b) && *b) b++;
+        pass_special_symbols(&a, &b, +1);
     }
 
     return *(const unsigned char*)(--a) - *(const unsigned char*)(--b);
@@ -29,12 +32,10 @@ int back_string_comparator(const void* arg1, const void* arg2){
     const char* a = (*(string*)arg1).end;
     const char* b = (*(string*)arg2).end;
 
-    while (strchr(special_symbols, *a) && *a) a--;
-    while (strchr(special_symbols, *b) && *b) b--;
+    pass_special_symbols(&a, &b, -1);
 
     while (*a && (*a-- == *b--)){
-        while (strchr(special_symbols, *a) && *a) a--;
-        while (strchr(special_symbols, *b) && *b) b--;
+        pass_special_symbols(&a, &b, -1);
     }
 
     return *(const unsigned char*)(++a) - *(const unsigned char*)(++b);

markov_strings/tests/output.txt

@@ -1,92 +1,92 @@
-Weaving thousands on bag LV
-Weaving thousands on bag LV
-Weaving thousands on bag LV
-Ha!
-Your boyfriend will wipe it off, he's a rag (Ha ha ha)
-See, a moth suits me (haha)
-Paw-paw, hit the carcass (ha)
-My guards have guards (La la la)
-(Let's go, la la la)
+Adlib is fresher than the whole music business (blee-blee)
+Ay, bitch, we got some guns (pr-r, paw)
+A year later, for the third year now, well, yeah (Yeah, yeah)
 A young samurai with a transparent umbrella
-Hey, the chain is on me, a rash of lava
-Hey, the chain is on me, a rash of lava
-Hey, the chain is on me, a rash of lava
+Bitch, I'm an aristocratic daddy
+Bitch, I'm a young aristocrat (I'm young)
+Bitch, I'm a young aristocrat (I'm young)
+Bitch, I'm hanging like a young Pushkin (y)
 Bitch, I'm wearing hundred-carat stones (And you're dumb)
 Bitch, I'm wearing hundred-carat stones (And you're dumb)
-To my sports car at the club
-This is a new Cadillac
-This is the new Cadillac
-This is the new Cadillac
-The lookbook spread
+Bitch, I am a young aristocrat (Aristocrat)
+Bitch, I am a young aristocrat (Aristocrat)
+Bitch, I have a hundred carat stones on me (Expensive, fucked up)
+Bitch, I have hundred carat stones on me (Expensive, fucked up)
+But what should I say to those fuckers? (Hmm)
 Chains are hanging on Dad (e)
-Adlib is fresher than the whole music business (blee-blee)
-I'm a legend, you can die
 Digging the cache with a shovel (e)
-Who dreamed of what, then we took it to the takeaway (fuck-me)
+Do not slurp, observe etiquette
+Ha!
+Hey, look at this
+Hey, the chain is on me, a rash of lava
+Hey, the chain is on me, a rash of lava
+Hey, the chain is on me, a rash of lava
+How are you? How are you?
+How are you? How are you?
+How are you? How are you?
+How is your salary?
+Hundreds of bitches want stones
+Hundreds of bitches want stones
+Hundreds of bitches want stones
 Hundreds of bitches want to come to me
 Hundreds of bitches want to come to me
 Hundreds of bitches want to come to me
-This is my yard, the fucking chill zone
-Rich, like a capper (e)
-So much money, like an Emirate (Emirate)
-So much money, like an Emirate (Emirate)
-Do not slurp, observe etiquette
-Threw ice on the plane, the HYPE will leave
-Your girlfriend is jerking off
-Bitch, I'm a young aristocrat (I'm young)
-Bitch, I'm a young aristocrat (I'm young)
-Your hoe is always waiting for me (Yeah, yeah)
-A year later, for the third year now, well, yeah (Yeah, yeah)
+I'm a legend, you can die
+I'm a legend, you can die (Hey, come on, huh)
+I'm a legend, you can die (Hey, come on)
+I'm a legend, you can die (Khm-khm-khm)
+I'm in my early twenties
+I'm in my early twenties
+I'm like that joke: from mouth to another mouth
 I'm wearing two pillows (oh yeah)
 I am busy, I don't give a fuck about the crisis, I grew up in it (wah-wah-wah)
-Two cartoons on my watch
-Two cartoons on my watch
-I'm like that joke: from mouth to another mouth
-I'm a legend, you can die (Hey, come on, huh)
-So much money, like an Emirate (I'm like Dubai)
-So much money, like an Emirate (I'm like Dubai)
 I only need a top, you're like a little mermaid (Suck)
-Look, look
-I'm a legend, you can die (Khm-khm-khm)
-But what should I say to those fuckers? (Hmm)
 I splattered her, but not in a salami (Cum)
-Under heavy currency rain
-I'm a legend, you can die (Hey, come on)
-This is my house, this is my jon
-Slava, what did you do?
-Slava, what did you do?
-They tell me: I did everything by deception (Fucked up)
-Bitch, I have a hundred carat stones on me (Expensive, fucked up)
-Bitch, I have hundred carat stones on me (Expensive, fucked up)
 (Kh-kh-kh) Fenimore Cooper
-They say: I will not become a legend (Never)
-I'm in my early twenties
-I'm in my early twenties
-Hundreds of bitches want stones
-Hundreds of bitches want stones
-Hundreds of bitches want stones
+(Let's go, la la la)
+Look, look
+Making money, fucking like that (okay, few)
 Making money, fucking like this
 Making money, fucking like this
-Hey, look at this
-Smeared her face with a magic wand (Oops)
-Three on the neck, seven under the ass
-Three on the neck, seven under the ass
-This fit will kill faster than ko-ro-na-wee-rus
-The baby is jumping, but not on a skipping rope (On what?)
-Bitch, I am a young aristocrat (Aristocrat)
-Bitch, I am a young aristocrat (Aristocrat)
-She's looking for a treasure on my card (Find it)
-How are you? How are you?
-How are you? How are you?
-How are you? How are you?
-Ay, bitch, we got some guns (pr-r, paw)
-Making money, fucking like that (okay, few)
-Bitch, I'm an aristocratic daddy
-Stop being so fuckin' Gredy
 Making money, making money
 Making money, making money
 Making money, making money
+My guards have guards (La la la)
 My lady, I beg you, if you suck on me, do it culturally
-Bitch, I'm hanging like a young Pushkin (y)
+Paw-paw, hit the carcass (ha)
+Rich, like a capper (e)
 Sayonara "Sick" Boy
-How is your salary?
+See, a moth suits me (haha)
+She's looking for a treasure on my card (Find it)
+Slava, what did you do?
+Slava, what did you do?
+Smeared her face with a magic wand (Oops)
+So much money, like an Emirate (Emirate)
+So much money, like an Emirate (Emirate)
+So much money, like an Emirate (I'm like Dubai)
+So much money, like an Emirate (I'm like Dubai)
+Stop being so fuckin' Gredy
+The baby is jumping, but not on a skipping rope (On what?)
+The lookbook spread
+They say: I will not become a legend (Never)
+They tell me: I did everything by deception (Fucked up)
+This fit will kill faster than ko-ro-na-wee-rus
+This is a new Cadillac
+This is my house, this is my jon
+This is my yard, the fucking chill zone
+This is the new Cadillac
+This is the new Cadillac
+Three on the neck, seven under the ass
+Three on the neck, seven under the ass
+Threw ice on the plane, the HYPE will leave
+To my sports car at the club
+Two cartoons on my watch
+Two cartoons on my watch
+Under heavy currency rain
+Weaving thousands on bag LV
+Weaving thousands on bag LV
+Weaving thousands on bag LV
+Who dreamed of what, then we took it to the takeaway (fuck-me)
+Your boyfriend will wipe it off, he's a rag (Ha ha ha)
+Your girlfriend is jerking off
+Your hoe is always waiting for me (Yeah, yeah)

stack_jopa/Makefile

@@ -0,0 +1,49 @@
+CC=g++
+INCLUDE_DIR = include
+# CFLAGS = -lm -I $(INCLUDE_DIR)
+CFLAGS=-Wall -Wextra -Wpedantic  -I $(INCLUDE_DIR) -fpermissive -O2 -DDEBUG
+#-fsanitize=address -Og -DDEBUG -ggdb -D_FORTIFY_SOURCE=2 -lgtest -fpermissive -lstdc++
+TEST_CFLAGS=-Wall -Wextra -Wpedantic -lm  -I $(INCLUDE_DIR)
+LDFLAGS=$(CFLAGS)
+TEST_BUILD=build_tests
+SRC_DIR=src
+EXECUTABLE=main
+TEST_EXECUTABLE=testrunner
+BUILD=build
+TEST_DIR=tests
+
+SOURCES :=$(wildcard $(SRC_DIR)/*.c) #main.c archive.c bitstream.c utils.c output.c
+SOURCES := $(filter-out $(SRC_DIR)/main.c, $(SOURCES))
+OBJECTS=$(SOURCES:$(SRC_DIR)/%.c=$(BUILD)/%.o)
+
+# TESTS=$(TEST_DIR)/runner.cpp
+TESTS=$(wildcard $(TEST_DIR)/*.cpp)
+TEST_OBJECTS=$(TESTS:$(TEST_DIR)/%.cpp=$(BUILD)/%.o)
+
+# run: $(BUILD)/main.o $(OBJECTS) $(EXECUTABLE)
+# 	$(CC) $(OBJECTS) $(BUILD)/main.o $(CFLAGS) -o $(BUILD)/$(EXECUTABLE)
+
+# test: $(OBJECTS) $(TEST_OBJECTS) $(TEST_EXECUTABLE) 
+# 	$(CC) $(TEST_OBJECTS) $(TEST_CFLAGS) -o $(TEST_BUILD)/$(TEST_EXECUTABLE)
+
+$(EXECUTABLE): $(OBJECTS) $(BUILD)/main.o
+	$(CC) $(OBJECTS) $(BUILD)/main.o $(LDFLAGS)  -o $(BUILD)/$@
+
+$(TEST_EXECUTABLE): $(OBJECTS) $(TEST_OBJECTS)
+	$(CC) $(OBJECTS) $(TEST_OBJECTS) $(LDFLAGS)  -o $(BUILD)/$@
+
+# %.o: $(SRC_DIR)/%.c
+#       $(CC) $(CFLAGS) -c $< -o $(BUILD)/$@
+
+
+$(BUILD)/%.o: $(SRC_DIR)/%.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(BUILD)/%.o: $(TEST_DIR)/%.cpp
+	$(CC) $(CFLAGS) -c $< -o $@
+
+# $(TEST_BUILD)/%.o: 
+# 	$(CC) $(CFLAGS) -c $< -o $@
+
+clean:
+	rm $(BUILD)/* #$(TEST_BUILD)/*

stack_jopa/README.MD

@@ -0,0 +1,4 @@
+
+- Канарейки
+- Фаззер
+- после пуша на стек делать nmap страницу константной 

stack_jopa/compile_flags.txt

@@ -0,0 +1,4 @@
+-Wall
+-Wextra
+-Wpedantic
+-Iinclude

stack_jopa/include/random.h

@@ -0,0 +1,7 @@
+#ifndef RANDOM_H
+#define RANDOM_H
+
+
+inline void generate_stack_canary(char* buf);
+
+#endif

stack_jopa/include/stack.h

@@ -0,0 +1,26 @@
+#ifndef STACK_H
+#define STACK_H
+
+#include <stddef.h>
+
+#define STACK_CAPACITY 512
+
+/* typedef size_t stack_element; */
+typedef union {
+    size_t num;
+    unsigned char bytes[sizeof(size_t)];
+} stack_element;
+
+typedef struct {
+    union {
+        stack_element* elements;
+        char* buffer;
+    };
+    unsigned int size;
+    stack_element canary;
+    size_t capacity;
+} Stack;
+
+
+
+#endif

stack_jopa/src/random.c

@@ -0,0 +1,30 @@
+#include "stack.h"
+#include <asm/unistd.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+#include <stddef.h>
+#include "random.h"
+
+#define GETRANDOM_SYSCALL_NUMBER 318
+
+// 0) https://stackoverflow.com/questions/9506353/how-to-invoke-a-system-call-via-syscall-or-sysenter-in-inline-assembly
+// 1) https://wiki.osdev.org/Inline_Assembly
+// 2) https://gcc.gnu.org/onlinedocs/gcc/extensions-to-the-c-language-family/how-to-use-inline-assembly-language-in-c-code.html#id2
+inline ssize_t getrandom(char* buf, size_t count, unsigned int flags){
+    ssize_t ret;
+    asm volatile
+    (
+        "syscall"
+        : "=a" (ret)
+        :   "0"(SYS_getrandom),
+            "D"(buf),           // D - RDI
+            "S"(count),         // S - RSI
+            "d"(flags)          // d - RDX
+        : "rcx", "r11", "memory" // clobbers
+    );
+    return ret;
+}
+
+inline void generate_stack_canary(char* buf){
+    getrandom(buf, sizeof(stack_element), NULL);
+}

stack_jopa/src/stack.c

@@ -0,0 +1,45 @@
+#include "stack.h"
+#include "random.h"
+
+void stack_new(Stack* stack){
+    generate_stack_canary(&stack->canary);
+    stack->elements = (stack_element *)malloc(sizeof(stack_element) * STACK_CAPACITY);
+    stack->size = 0;
+    stack->capacity = STACK_CAPACITY;
+}
+
+void stack_delete(Stack* stack){
+    assert(stack != NULL);
+    assert(stack->elements != NULL, "Already free!");
+
+    free(stack->elements);
+
+    stack->elements = NULL;
+    stack->size = NULL;
+    stack->capacity = NULL;
+    stack->canary.num = NULL;
+}
+
+// пока канарейка будет после каждого пуша и попа
+void stack_push(Stack* stack, stack_element element){
+    assert(stack != NULL);
+
+    if (stack->size >= stack->capacity-1){ // capacity-1, capacity
+        stack->capacity <<= 1;
+        stack->elements = realloc(stack->elements, stack->capacity * sizeof(stack_element));
+    }
+
+    stack->elements[stack->size++] = element;
+    stack->elements[stack->size++] = stack->canary;
+}
+
+stack_element stack_pop(Stack* stack){
+    assert(stack != NULL);
+    assert(stack->size < stack->capacity - 1);
+
+    stack_element canary  = stack->elements[stack->size--];
+    stack_element element = stack->elements[stack->size--];
+
+    assert(canary.num == stack->canary.num, "Stack corruption detected"); // TODO: заменить ассерт на что-то другое
+    return element;
+}