From 15d85fbab7766771e1e2861171d4bc1efeaeb589 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Thu, 28 Dec 2023 20:25:54 +0200 Subject: [PATCH] chapters: Move activities to drills, assets to media Rename `activities/` directory to `drills/`. And rename `assets/` to `media/`. Also place `README.md` in `reading/` directory. Signed-off-by: Razvan Deaconescu --- .../{activities => drills}/00-tutorial/src/Makefile | 0 .../00-tutorial/src/buffers.c | 0 .../00-tutorial/src/script.py | 0 .../00-tutorial/src/simple_read.c | 0 .../01-challenge-parrot/sol/parrot.c | 0 .../01-challenge-parrot/sol/solve.py | 0 .../01-challenge-parrot/src/parrot | Bin .../02-challenge-indexing/sol/.gdb_history | 0 .../02-challenge-indexing/sol/indexing.c | 0 .../02-challenge-indexing/sol/solve.py | 0 .../02-challenge-indexing/src/indexing | Bin .../03-challenge-level7/sol/level07.c | 0 .../03-challenge-level7/sol/solve.py | 0 .../03-challenge-level7/src/atoi | Bin .../03-challenge-level7/src/atoi.c | 0 .../03-challenge-level7/src/level07 | Bin .../04-challenge-neighbourly/sol/neighbourly.c | 0 .../04-challenge-neighbourly/sol/solve.py | 0 .../04-challenge-neighbourly/src/neighbourly | Bin .../sol/input_functions.c | 0 .../05-challenge-input-functions/sol/solve.py | 0 .../src/input_functions | Bin .../06-challenge-birds/sol/birds.c | 0 .../06-challenge-birds/sol/solve.py | 0 .../06-challenge-birds/src/birds | Bin .../{assets => media}/stack_buffer.png | Bin .../{assets => media}/stack_x86_64.png | Bin .../buffer-exploitation/{ => reading}/README.md | 0 .../01-leak-call-system/sol/exploit.py | 0 .../01-leak-call-system/sol/rop.c | 0 .../01-leak-call-system/src/rop | Bin .../02-low-stack-space/sol/exploit_mprotect.py | 0 .../02-low-stack-space/sol/exploit_ret2main.py | 0 .../02-low-stack-space/sol/exploit_stack_pivot.py | 0 .../02-low-stack-space/sol/rop_limited.c | 0 .../02-low-stack-space/src/rop_limited | Bin .../{ => reading}/README.md | 0 .../{activities => drills}/00-demo/sol/exploit.py | 0 .../{activities => drills}/00-demo/sol/exploit64.py | 0 .../{activities => drills}/00-demo/src/Makefile | 0 .../{activities => drills}/00-demo/src/Makefile.64 | 0 .../{activities => drills}/00-demo/src/exploit.py | 0 .../{activities => drills}/00-demo/src/exploit64.py | 0 .../{activities => drills}/00-demo/src/vuln.c | 0 .../{activities => drills}/00-demo/src/vuln64 | Bin .../01-tutorial-ret-to-libc/sol/auth.c | 0 .../01-tutorial-ret-to-libc/sol/sol.sh | 0 .../01-tutorial-ret-to-libc/src/auth | Bin .../03-challenge-no-ret-control/sol/force_exit.c | 0 .../03-challenge-no-ret-control/sol/skel.py | 0 .../03-challenge-no-ret-control/src/force_exit | Bin .../04-challenge-ret-to-plt/sol/.gdb_history | 0 .../04-challenge-ret-to-plt/sol/exploit.py | 0 .../04-challenge-ret-to-plt/src/random | Bin .../05-gadget-tutorial/sol/payload.py | 0 .../05-gadget-tutorial/src/gadget_tut | Bin .../06-echo-service/sol/client.scr | 0 .../06-echo-service/sol/echo_service | Bin .../06-echo-service/sol/echo_service.c | 0 .../06-echo-service/sol/echo_service.scr | 0 .../06-echo-service/sol/payload-aslr-alt.py | 0 .../06-echo-service/sol/payload-aslr.py | 0 .../06-echo-service/sol/payload-no-aslr.py | 0 .../06-echo-service/src/echo_service | Bin .../{assets => media}/overwatch_stack_conflict.png | Bin .../overwatch_stack_no_conflict.png | Bin .../{assets => media}/overwatch_stack_simple.png | Bin .../{ => reading}/README.md | 0 .../src/09-challenge-shellcode-stack-hard | 1 - .../src/10-challenge-shellcode-argv | 1 - .../src/11-challenge-shellcode-env | 1 - .../01-tutorial-avoiding-overwriting/src/Makefile | 0 .../01-tutorial-avoiding-overwriting/src/exploit.py | 0 .../01-tutorial-avoiding-overwriting/src/script.py | 0 .../01-tutorial-avoiding-overwriting/src/vuln.c | 0 .../02-tutorial-nop-sleds/src/Makefile | 0 .../02-tutorial-nop-sleds/src/exploit.py | 0 .../02-tutorial-nop-sleds/src/script.py | 0 .../02-tutorial-nop-sleds/src/vuln.c | 0 .../03-tutorial-null-free-shellcode/src/Makefile | 0 .../03-tutorial-null-free-shellcode/src/exploit.py | 0 .../03-tutorial-null-free-shellcode/src/vuln.c | 0 .../src/.gitignore | 0 .../src/Makefile | 0 .../05-tutorial-alphanumeric-shellcodes/src/vuln.c | 0 .../src/09-challenge-shellcode-stack-hard | 1 + .../src/10-challenge-shellcode-argv | 1 + .../src/11-challenge-shellcode-env | 1 + .../07-challenge-no-nops-allowed/src/.gitignore | 0 .../07-challenge-no-nops-allowed/src/Makefile | 0 .../07-challenge-no-nops-allowed/src/vuln.c | 0 .../08-challenge-multiline-output/src/.gitignore | 0 .../08-challenge-multiline-output/src/Makefile | 0 .../08-challenge-multiline-output/src/vuln.c | 0 .../src/.gitignore | 0 .../src/Makefile | 0 .../09-challenge-execve-blocking-attempt/src/vuln.c | 0 .../shellcodes-advanced/{ => reading}/README.md | 0 .../src/Makefile | 0 .../src/exit_shellcode.nasm | 0 .../src/mystery_shellcode.bin | Bin .../03-tutorial-injecting-machine-code/src/Makefile | 0 .../src/exit_shellcode.nasm | 0 .../03-tutorial-injecting-machine-code/src/vuln.c | 0 .../03-tutorial-injecting-machine-code/src/vuln2.c | 0 .../04-tutorial-hello-world-shellcode/src/Makefile | 0 .../src/exploit.py | 0 .../src/hello_shellcode.nasm | 0 .../04-tutorial-hello-world-shellcode/src/vuln.c | 0 .../05-tutorial-debugging-shellcodes/src | 0 .../06-challenge-binsh-shellcode/src/Makefile | 0 .../src/binsh_shellcode.nasm | 0 .../06-challenge-binsh-shellcode/src/exploit.py | 0 .../06-challenge-binsh-shellcode/src/vuln.c | 0 .../07-challenge-shellcode-on-stack/sol/exploit.py | 0 .../07-challenge-shellcode-on-stack/src/Makefile | 0 .../07-challenge-shellcode-on-stack/src/vuln.c | 0 .../08-challenge-shellcode-after/sol/exploit.py | 0 .../08-challenge-shellcode-after/src/Makefile | 0 .../08-challenge-shellcode-after/src/vuln.c | 0 .../09-challenge-shellcode-stack-hard/src/Makefile | 0 .../09-challenge-shellcode-stack-hard/src/vuln.c | 0 .../10-challenge-shellcode-argv/sol/exploit.py | 0 .../10-challenge-shellcode-argv/src/Makefile | 0 .../10-challenge-shellcode-argv/src/vuln.c | 0 .../11-challenge-shellcode-env/sol/exploit.py | 0 .../11-challenge-shellcode-env/src/Makefile | 0 .../11-challenge-shellcode-env/src/vuln.c | 0 .../{assets => media}/shellcode_above.drawio | 0 .../{assets => media}/shellcode_above.png | Bin .../{assets => media}/shellcode_below.drawio | 0 .../{assets => media}/shellcode_below.png | Bin .../shellcodes/{assets => media}/stack_buffer.png | Bin .../shellcodes/{ => reading}/README.md | 0 .../Makefile | 0 .../exploit.py | 0 .../exploit3.py | 0 .../01-tutorial-bypass-dep-system-sh-present/vuln.c | 0 .../Makefile | 0 .../exploit.py | 0 .../exploit3.py | 0 .../vuln.c | 0 .../03-tutorial-bypass-dep-no-aslr-libc/Makefile | 0 .../03-tutorial-bypass-dep-no-aslr-libc/README.md | 0 .../03-tutorial-bypass-dep-no-aslr-libc/exploit3.py | 0 .../03-tutorial-bypass-dep-no-aslr-libc/vuln.c | 0 .../04-tutorial-bypass-dep-aslr-libc/Makefile | 0 .../04-tutorial-bypass-dep-aslr-libc/exploit.py | 0 .../04-tutorial-bypass-dep-aslr-libc/exploit3.py | 0 .../04-tutorial-bypass-dep-aslr-libc/vuln.c | 0 .../ld-linux.so.2 | Bin .../05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 | Bin .../rwslotmachine7 | Bin .../sol_pie_bypass.py | 0 .../sol/exploit3.py | 0 .../sol/vuln.c | 0 .../src/vuln | Bin .../sol/exploit3.py | 0 .../sol/vuln.c | 0 .../src/vuln | Bin .../08-challenge-bypass-dep-no-aslr-libc/README.md | 0 .../sol/exploit3.py | 0 .../08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c | 0 .../08-challenge-bypass-dep-no-aslr-libc/src/vuln | Bin .../09-challenge-bypass-dep-aslr-libc/.gitignore | 0 .../09-challenge-bypass-dep-aslr-libc/README.md | 0 .../sol/exploit3.py | 0 .../09-challenge-bypass-dep-aslr-libc/sol/vuln.c | 0 .../09-challenge-bypass-dep-aslr-libc/src/vuln | 0 .../defense-mechanisms/{ => reading}/README.md | 0 .../information-leaks/{ => reading}/README.md | 0 171 files changed, 3 insertions(+), 3 deletions(-) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/00-tutorial/src/Makefile (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/00-tutorial/src/buffers.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/00-tutorial/src/script.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/00-tutorial/src/simple_read.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/01-challenge-parrot/sol/parrot.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/01-challenge-parrot/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/01-challenge-parrot/src/parrot (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/02-challenge-indexing/sol/.gdb_history (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/02-challenge-indexing/sol/indexing.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/02-challenge-indexing/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/02-challenge-indexing/src/indexing (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/03-challenge-level7/sol/level07.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/03-challenge-level7/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/03-challenge-level7/src/atoi (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/03-challenge-level7/src/atoi.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/03-challenge-level7/src/level07 (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/04-challenge-neighbourly/sol/neighbourly.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/04-challenge-neighbourly/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/04-challenge-neighbourly/src/neighbourly (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/05-challenge-input-functions/sol/input_functions.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/05-challenge-input-functions/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/05-challenge-input-functions/src/input_functions (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/06-challenge-birds/sol/birds.c (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/06-challenge-birds/sol/solve.py (100%) rename chapters/exploitation-techniques/buffer-exploitation/{activities => drills}/06-challenge-birds/src/birds (100%) rename chapters/exploitation-techniques/buffer-exploitation/{assets => media}/stack_buffer.png (100%) rename chapters/exploitation-techniques/buffer-exploitation/{assets => media}/stack_x86_64.png (100%) rename chapters/exploitation-techniques/buffer-exploitation/{ => reading}/README.md (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/01-leak-call-system/sol/exploit.py (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/01-leak-call-system/sol/rop.c (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/01-leak-call-system/src/rop (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/02-low-stack-space/sol/exploit_mprotect.py (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/02-low-stack-space/sol/exploit_ret2main.py (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/02-low-stack-space/sol/exploit_stack_pivot.py (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/02-low-stack-space/sol/rop_limited.c (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{activities => drills}/02-low-stack-space/src/rop_limited (100%) rename chapters/exploitation-techniques/return-oriented-programming-advanced/{ => reading}/README.md (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/sol/exploit.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/sol/exploit64.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/Makefile (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/Makefile.64 (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/exploit.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/exploit64.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/vuln.c (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/00-demo/src/vuln64 (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/01-tutorial-ret-to-libc/sol/auth.c (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/01-tutorial-ret-to-libc/sol/sol.sh (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/01-tutorial-ret-to-libc/src/auth (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/03-challenge-no-ret-control/sol/force_exit.c (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/03-challenge-no-ret-control/sol/skel.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/03-challenge-no-ret-control/src/force_exit (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/04-challenge-ret-to-plt/sol/.gdb_history (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/04-challenge-ret-to-plt/sol/exploit.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/04-challenge-ret-to-plt/src/random (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/05-gadget-tutorial/sol/payload.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/05-gadget-tutorial/src/gadget_tut (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/client.scr (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/echo_service (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/echo_service.c (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/echo_service.scr (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/payload-aslr-alt.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/payload-aslr.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/sol/payload-no-aslr.py (100%) rename chapters/exploitation-techniques/return-oriented-programming/{activities => drills}/06-echo-service/src/echo_service (100%) rename chapters/exploitation-techniques/return-oriented-programming/{assets => media}/overwatch_stack_conflict.png (100%) rename chapters/exploitation-techniques/return-oriented-programming/{assets => media}/overwatch_stack_no_conflict.png (100%) rename chapters/exploitation-techniques/return-oriented-programming/{assets => media}/overwatch_stack_simple.png (100%) rename chapters/exploitation-techniques/return-oriented-programming/{ => reading}/README.md (100%) delete mode 120000 chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard delete mode 120000 chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv delete mode 120000 chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/01-tutorial-avoiding-overwriting/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/01-tutorial-avoiding-overwriting/src/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/01-tutorial-avoiding-overwriting/src/script.py (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/01-tutorial-avoiding-overwriting/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/02-tutorial-nop-sleds/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/02-tutorial-nop-sleds/src/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/02-tutorial-nop-sleds/src/script.py (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/02-tutorial-nop-sleds/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/03-tutorial-null-free-shellcode/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/03-tutorial-null-free-shellcode/src/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/03-tutorial-null-free-shellcode/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/05-tutorial-alphanumeric-shellcodes/src/.gitignore (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/05-tutorial-alphanumeric-shellcodes/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/05-tutorial-alphanumeric-shellcodes/src/vuln.c (100%) create mode 120000 chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard create mode 120000 chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv create mode 120000 chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/07-challenge-no-nops-allowed/src/.gitignore (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/07-challenge-no-nops-allowed/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/07-challenge-no-nops-allowed/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/08-challenge-multiline-output/src/.gitignore (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/08-challenge-multiline-output/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/08-challenge-multiline-output/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/09-challenge-execve-blocking-attempt/src/.gitignore (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/09-challenge-execve-blocking-attempt/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{activities => drills}/09-challenge-execve-blocking-attempt/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes-advanced/{ => reading}/README.md (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/01-tutorial-generating-machine-code/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/01-tutorial-generating-machine-code/src/exit_shellcode.nasm (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/02-tutorial-inspecting-machine-code/src/mystery_shellcode.bin (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/03-tutorial-injecting-machine-code/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/03-tutorial-injecting-machine-code/src/exit_shellcode.nasm (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/03-tutorial-injecting-machine-code/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/03-tutorial-injecting-machine-code/src/vuln2.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/04-tutorial-hello-world-shellcode/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/04-tutorial-hello-world-shellcode/src/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/04-tutorial-hello-world-shellcode/src/hello_shellcode.nasm (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/04-tutorial-hello-world-shellcode/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/05-tutorial-debugging-shellcodes/src (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/06-challenge-binsh-shellcode/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/06-challenge-binsh-shellcode/src/binsh_shellcode.nasm (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/06-challenge-binsh-shellcode/src/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/06-challenge-binsh-shellcode/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/07-challenge-shellcode-on-stack/sol/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/07-challenge-shellcode-on-stack/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/07-challenge-shellcode-on-stack/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/08-challenge-shellcode-after/sol/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/08-challenge-shellcode-after/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/08-challenge-shellcode-after/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/09-challenge-shellcode-stack-hard/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/09-challenge-shellcode-stack-hard/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/10-challenge-shellcode-argv/sol/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/10-challenge-shellcode-argv/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/10-challenge-shellcode-argv/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/11-challenge-shellcode-env/sol/exploit.py (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/11-challenge-shellcode-env/src/Makefile (100%) rename chapters/exploitation-techniques/shellcodes/{activities => drills}/11-challenge-shellcode-env/src/vuln.c (100%) rename chapters/exploitation-techniques/shellcodes/{assets => media}/shellcode_above.drawio (100%) rename chapters/exploitation-techniques/shellcodes/{assets => media}/shellcode_above.png (100%) rename chapters/exploitation-techniques/shellcodes/{assets => media}/shellcode_below.drawio (100%) rename chapters/exploitation-techniques/shellcodes/{assets => media}/shellcode_below.png (100%) rename chapters/exploitation-techniques/shellcodes/{assets => media}/stack_buffer.png (100%) rename chapters/exploitation-techniques/shellcodes/{ => reading}/README.md (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/01-tutorial-bypass-dep-system-sh-present/Makefile (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/01-tutorial-bypass-dep-system-sh-present/exploit.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/01-tutorial-bypass-dep-system-sh-present/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/01-tutorial-bypass-dep-system-sh-present/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/02-tutorial-bypass-dep-system-sh-separate/Makefile (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/02-tutorial-bypass-dep-system-sh-separate/exploit.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/02-tutorial-bypass-dep-system-sh-separate/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/02-tutorial-bypass-dep-system-sh-separate/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/03-tutorial-bypass-dep-no-aslr-libc/Makefile (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/03-tutorial-bypass-dep-no-aslr-libc/README.md (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/03-tutorial-bypass-dep-no-aslr-libc/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/03-tutorial-bypass-dep-no-aslr-libc/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/04-tutorial-bypass-dep-aslr-libc/Makefile (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/04-tutorial-bypass-dep-aslr-libc/exploit.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/04-tutorial-bypass-dep-aslr-libc/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/04-tutorial-bypass-dep-aslr-libc/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/05-tutorial-bypass-dep-aslr-pie-rop/ld-linux.so.2 (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/05-tutorial-bypass-dep-aslr-pie-rop/rwslotmachine7 (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/05-tutorial-bypass-dep-aslr-pie-rop/sol_pie_bypass.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/06-challenge-bypass-dep-system-sh-present/sol/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/06-challenge-bypass-dep-system-sh-present/sol/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/06-challenge-bypass-dep-system-sh-present/src/vuln (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/07-challenge-bypass-dep-system-sh-separate/sol/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/07-challenge-bypass-dep-system-sh-separate/sol/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/07-challenge-bypass-dep-system-sh-separate/src/vuln (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/08-challenge-bypass-dep-no-aslr-libc/README.md (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/08-challenge-bypass-dep-no-aslr-libc/sol/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/08-challenge-bypass-dep-no-aslr-libc/src/vuln (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/09-challenge-bypass-dep-aslr-libc/.gitignore (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/09-challenge-bypass-dep-aslr-libc/README.md (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/09-challenge-bypass-dep-aslr-libc/sol/exploit3.py (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/09-challenge-bypass-dep-aslr-libc/sol/vuln.c (100%) rename chapters/mitigations-and-defensive-strategies/bypassing-mitigations/{activities => drills}/09-challenge-bypass-dep-aslr-libc/src/vuln (100%) rename chapters/mitigations-and-defensive-strategies/defense-mechanisms/{ => reading}/README.md (100%) rename chapters/mitigations-and-defensive-strategies/information-leaks/{ => reading}/README.md (100%) diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/Makefile b/chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/Makefile rename to chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/Makefile diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/buffers.c b/chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/buffers.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/buffers.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/buffers.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/script.py b/chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/script.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/script.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/script.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/simple_read.c b/chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/simple_read.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/00-tutorial/src/simple_read.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/00-tutorial/src/simple_read.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/sol/parrot.c b/chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/sol/parrot.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/sol/parrot.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/sol/parrot.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/src/parrot b/chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/src/parrot similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/01-challenge-parrot/src/parrot rename to chapters/exploitation-techniques/buffer-exploitation/drills/01-challenge-parrot/src/parrot diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/.gdb_history b/chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/.gdb_history similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/.gdb_history rename to chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/.gdb_history diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/indexing.c b/chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/indexing.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/indexing.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/indexing.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/src/indexing b/chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/src/indexing similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/02-challenge-indexing/src/indexing rename to chapters/exploitation-techniques/buffer-exploitation/drills/02-challenge-indexing/src/indexing diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/sol/level07.c b/chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/sol/level07.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/sol/level07.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/sol/level07.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/atoi b/chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/atoi similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/atoi rename to chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/atoi diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/atoi.c b/chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/atoi.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/atoi.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/atoi.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/level07 b/chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/level07 similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/03-challenge-level7/src/level07 rename to chapters/exploitation-techniques/buffer-exploitation/drills/03-challenge-level7/src/level07 diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/sol/neighbourly.c b/chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/sol/neighbourly.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/sol/neighbourly.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/sol/neighbourly.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/src/neighbourly b/chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/src/neighbourly similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/04-challenge-neighbourly/src/neighbourly rename to chapters/exploitation-techniques/buffer-exploitation/drills/04-challenge-neighbourly/src/neighbourly diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/sol/input_functions.c b/chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/sol/input_functions.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/sol/input_functions.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/sol/input_functions.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/src/input_functions b/chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/src/input_functions similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/05-challenge-input-functions/src/input_functions rename to chapters/exploitation-techniques/buffer-exploitation/drills/05-challenge-input-functions/src/input_functions diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/sol/birds.c b/chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/sol/birds.c similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/sol/birds.c rename to chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/sol/birds.c diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/sol/solve.py b/chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/sol/solve.py similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/sol/solve.py rename to chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/sol/solve.py diff --git a/chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/src/birds b/chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/src/birds similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/activities/06-challenge-birds/src/birds rename to chapters/exploitation-techniques/buffer-exploitation/drills/06-challenge-birds/src/birds diff --git a/chapters/exploitation-techniques/buffer-exploitation/assets/stack_buffer.png b/chapters/exploitation-techniques/buffer-exploitation/media/stack_buffer.png similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/assets/stack_buffer.png rename to chapters/exploitation-techniques/buffer-exploitation/media/stack_buffer.png diff --git a/chapters/exploitation-techniques/buffer-exploitation/assets/stack_x86_64.png b/chapters/exploitation-techniques/buffer-exploitation/media/stack_x86_64.png similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/assets/stack_x86_64.png rename to chapters/exploitation-techniques/buffer-exploitation/media/stack_x86_64.png diff --git a/chapters/exploitation-techniques/buffer-exploitation/README.md b/chapters/exploitation-techniques/buffer-exploitation/reading/README.md similarity index 100% rename from chapters/exploitation-techniques/buffer-exploitation/README.md rename to chapters/exploitation-techniques/buffer-exploitation/reading/README.md diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/sol/exploit.py b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/sol/exploit.py rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/sol/exploit.py diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/sol/rop.c b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/sol/rop.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/sol/rop.c rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/sol/rop.c diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/src/rop b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/src/rop similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/01-leak-call-system/src/rop rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/01-leak-call-system/src/rop diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_mprotect.py b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_mprotect.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_mprotect.py rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_mprotect.py diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_ret2main.py b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_ret2main.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_ret2main.py rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_ret2main.py diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_stack_pivot.py b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_stack_pivot.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/exploit_stack_pivot.py rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/exploit_stack_pivot.py diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/rop_limited.c b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/rop_limited.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/sol/rop_limited.c rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/sol/rop_limited.c diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/src/rop_limited b/chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/src/rop_limited similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/activities/02-low-stack-space/src/rop_limited rename to chapters/exploitation-techniques/return-oriented-programming-advanced/drills/02-low-stack-space/src/rop_limited diff --git a/chapters/exploitation-techniques/return-oriented-programming-advanced/README.md b/chapters/exploitation-techniques/return-oriented-programming-advanced/reading/README.md similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming-advanced/README.md rename to chapters/exploitation-techniques/return-oriented-programming-advanced/reading/README.md diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/sol/exploit.py b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/sol/exploit.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/sol/exploit.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/sol/exploit64.py b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/sol/exploit64.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/sol/exploit64.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/sol/exploit64.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/Makefile b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/Makefile rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/Makefile diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/Makefile.64 b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/Makefile.64 similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/Makefile.64 rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/Makefile.64 diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/exploit.py b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/exploit.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/exploit.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/exploit64.py b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/exploit64.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/exploit64.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/exploit64.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/vuln.c b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/vuln.c rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/vuln.c diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/vuln64 b/chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/vuln64 similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/00-demo/src/vuln64 rename to chapters/exploitation-techniques/return-oriented-programming/drills/00-demo/src/vuln64 diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/sol/auth.c b/chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/sol/auth.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/sol/auth.c rename to chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/sol/auth.c diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/sol/sol.sh b/chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/sol/sol.sh similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/sol/sol.sh rename to chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/sol/sol.sh diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/src/auth b/chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/src/auth similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/01-tutorial-ret-to-libc/src/auth rename to chapters/exploitation-techniques/return-oriented-programming/drills/01-tutorial-ret-to-libc/src/auth diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/sol/force_exit.c b/chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/sol/force_exit.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/sol/force_exit.c rename to chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/sol/force_exit.c diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/sol/skel.py b/chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/sol/skel.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/sol/skel.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/sol/skel.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/src/force_exit b/chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/src/force_exit similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/03-challenge-no-ret-control/src/force_exit rename to chapters/exploitation-techniques/return-oriented-programming/drills/03-challenge-no-ret-control/src/force_exit diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/sol/.gdb_history b/chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/sol/.gdb_history similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/sol/.gdb_history rename to chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/sol/.gdb_history diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/sol/exploit.py b/chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/sol/exploit.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/sol/exploit.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/src/random b/chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/src/random similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/04-challenge-ret-to-plt/src/random rename to chapters/exploitation-techniques/return-oriented-programming/drills/04-challenge-ret-to-plt/src/random diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/05-gadget-tutorial/sol/payload.py b/chapters/exploitation-techniques/return-oriented-programming/drills/05-gadget-tutorial/sol/payload.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/05-gadget-tutorial/sol/payload.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/05-gadget-tutorial/sol/payload.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/05-gadget-tutorial/src/gadget_tut b/chapters/exploitation-techniques/return-oriented-programming/drills/05-gadget-tutorial/src/gadget_tut similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/05-gadget-tutorial/src/gadget_tut rename to chapters/exploitation-techniques/return-oriented-programming/drills/05-gadget-tutorial/src/gadget_tut diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/client.scr b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/client.scr similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/client.scr rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/client.scr diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service.c b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service.c similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service.c rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service.c diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service.scr b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service.scr similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/echo_service.scr rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/echo_service.scr diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-aslr-alt.py b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-aslr-alt.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-aslr-alt.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-aslr-alt.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-aslr.py b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-aslr.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-aslr.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-aslr.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-no-aslr.py b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-no-aslr.py similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/sol/payload-no-aslr.py rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/sol/payload-no-aslr.py diff --git a/chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/src/echo_service b/chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/src/echo_service similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/activities/06-echo-service/src/echo_service rename to chapters/exploitation-techniques/return-oriented-programming/drills/06-echo-service/src/echo_service diff --git a/chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_conflict.png b/chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_conflict.png similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_conflict.png rename to chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_conflict.png diff --git a/chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_no_conflict.png b/chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_no_conflict.png similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_no_conflict.png rename to chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_no_conflict.png diff --git a/chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_simple.png b/chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_simple.png similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/assets/overwatch_stack_simple.png rename to chapters/exploitation-techniques/return-oriented-programming/media/overwatch_stack_simple.png diff --git a/chapters/exploitation-techniques/return-oriented-programming/README.md b/chapters/exploitation-techniques/return-oriented-programming/reading/README.md similarity index 100% rename from chapters/exploitation-techniques/return-oriented-programming/README.md rename to chapters/exploitation-techniques/return-oriented-programming/reading/README.md diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard b/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard deleted file mode 120000 index 5ac6f78..0000000 --- a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard +++ /dev/null @@ -1 +0,0 @@ -../../../../shellcodes/activities/09-challenge-shellcode-stack-hard \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv b/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv deleted file mode 120000 index 2d3397e..0000000 --- a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv +++ /dev/null @@ -1 +0,0 @@ -../../../../shellcodes/activities/10-challenge-shellcode-argv/src \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env b/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env deleted file mode 120000 index dbb59af..0000000 --- a/chapters/exploitation-techniques/shellcodes-advanced/activities/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env +++ /dev/null @@ -1 +0,0 @@ -../../../../shellcodes/activities/11-challenge-shellcode-env/src \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/exploit.py b/chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/exploit.py rename to chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/script.py b/chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/script.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/script.py rename to chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/script.py diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/01-tutorial-avoiding-overwriting/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/01-tutorial-avoiding-overwriting/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/exploit.py b/chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/exploit.py rename to chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/script.py b/chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/script.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/script.py rename to chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/script.py diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/02-tutorial-nop-sleds/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/02-tutorial-nop-sleds/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/exploit.py b/chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/exploit.py rename to chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/03-tutorial-null-free-shellcode/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/03-tutorial-null-free-shellcode/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/.gitignore b/chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/.gitignore similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/.gitignore rename to chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/.gitignore diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/05-tutorial-alphanumeric-shellcodes/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/05-tutorial-alphanumeric-shellcodes/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard new file mode 120000 index 0000000..ee93aa7 --- /dev/null +++ b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/09-challenge-shellcode-stack-hard @@ -0,0 +1 @@ +../../../../shellcodes/drills/09-challenge-shellcode-stack-hard/ \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv new file mode 120000 index 0000000..6c7301d --- /dev/null +++ b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/10-challenge-shellcode-argv @@ -0,0 +1 @@ +../../../../shellcodes/drills/10-challenge-shellcode-argv/src/ \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env new file mode 120000 index 0000000..3c3bb4c --- /dev/null +++ b/chapters/exploitation-techniques/shellcodes-advanced/drills/06-challenge-nop-sled-redo/src/11-challenge-shellcode-env @@ -0,0 +1 @@ +../../../../shellcodes/drills/11-challenge-shellcode-env/src/ \ No newline at end of file diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/.gitignore b/chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/.gitignore similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/.gitignore rename to chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/.gitignore diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/07-challenge-no-nops-allowed/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/07-challenge-no-nops-allowed/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/.gitignore b/chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/.gitignore similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/.gitignore rename to chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/.gitignore diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/08-challenge-multiline-output/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/08-challenge-multiline-output/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/.gitignore b/chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/.gitignore similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/.gitignore rename to chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/.gitignore diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/Makefile b/chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/Makefile rename to chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/vuln.c b/chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/activities/09-challenge-execve-blocking-attempt/src/vuln.c rename to chapters/exploitation-techniques/shellcodes-advanced/drills/09-challenge-execve-blocking-attempt/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes-advanced/README.md b/chapters/exploitation-techniques/shellcodes-advanced/reading/README.md similarity index 100% rename from chapters/exploitation-techniques/shellcodes-advanced/README.md rename to chapters/exploitation-techniques/shellcodes-advanced/reading/README.md diff --git a/chapters/exploitation-techniques/shellcodes/activities/01-tutorial-generating-machine-code/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/01-tutorial-generating-machine-code/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/01-tutorial-generating-machine-code/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/01-tutorial-generating-machine-code/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/01-tutorial-generating-machine-code/src/exit_shellcode.nasm b/chapters/exploitation-techniques/shellcodes/drills/01-tutorial-generating-machine-code/src/exit_shellcode.nasm similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/01-tutorial-generating-machine-code/src/exit_shellcode.nasm rename to chapters/exploitation-techniques/shellcodes/drills/01-tutorial-generating-machine-code/src/exit_shellcode.nasm diff --git a/chapters/exploitation-techniques/shellcodes/activities/02-tutorial-inspecting-machine-code/src/mystery_shellcode.bin b/chapters/exploitation-techniques/shellcodes/drills/02-tutorial-inspecting-machine-code/src/mystery_shellcode.bin similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/02-tutorial-inspecting-machine-code/src/mystery_shellcode.bin rename to chapters/exploitation-techniques/shellcodes/drills/02-tutorial-inspecting-machine-code/src/mystery_shellcode.bin diff --git a/chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/exit_shellcode.nasm b/chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/exit_shellcode.nasm similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/exit_shellcode.nasm rename to chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/exit_shellcode.nasm diff --git a/chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/vuln2.c b/chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/vuln2.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/03-tutorial-injecting-machine-code/src/vuln2.c rename to chapters/exploitation-techniques/shellcodes/drills/03-tutorial-injecting-machine-code/src/vuln2.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/hello_shellcode.nasm b/chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/hello_shellcode.nasm similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/hello_shellcode.nasm rename to chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/hello_shellcode.nasm diff --git a/chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/04-tutorial-hello-world-shellcode/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/04-tutorial-hello-world-shellcode/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/05-tutorial-debugging-shellcodes/src b/chapters/exploitation-techniques/shellcodes/drills/05-tutorial-debugging-shellcodes/src similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/05-tutorial-debugging-shellcodes/src rename to chapters/exploitation-techniques/shellcodes/drills/05-tutorial-debugging-shellcodes/src diff --git a/chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/binsh_shellcode.nasm b/chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/binsh_shellcode.nasm similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/binsh_shellcode.nasm rename to chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/binsh_shellcode.nasm diff --git a/chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/06-challenge-binsh-shellcode/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/06-challenge-binsh-shellcode/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/sol/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/sol/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/sol/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/07-challenge-shellcode-on-stack/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/07-challenge-shellcode-on-stack/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/sol/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/sol/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/sol/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/08-challenge-shellcode-after/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/08-challenge-shellcode-after/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/09-challenge-shellcode-stack-hard/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/09-challenge-shellcode-stack-hard/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/09-challenge-shellcode-stack-hard/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/09-challenge-shellcode-stack-hard/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/09-challenge-shellcode-stack-hard/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/09-challenge-shellcode-stack-hard/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/09-challenge-shellcode-stack-hard/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/09-challenge-shellcode-stack-hard/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/sol/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/sol/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/sol/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/10-challenge-shellcode-argv/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/10-challenge-shellcode-argv/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/sol/exploit.py b/chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/sol/exploit.py similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/sol/exploit.py rename to chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/sol/exploit.py diff --git a/chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/src/Makefile b/chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/src/Makefile similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/src/Makefile rename to chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/src/Makefile diff --git a/chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/src/vuln.c b/chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/src/vuln.c similarity index 100% rename from chapters/exploitation-techniques/shellcodes/activities/11-challenge-shellcode-env/src/vuln.c rename to chapters/exploitation-techniques/shellcodes/drills/11-challenge-shellcode-env/src/vuln.c diff --git a/chapters/exploitation-techniques/shellcodes/assets/shellcode_above.drawio b/chapters/exploitation-techniques/shellcodes/media/shellcode_above.drawio similarity index 100% rename from chapters/exploitation-techniques/shellcodes/assets/shellcode_above.drawio rename to chapters/exploitation-techniques/shellcodes/media/shellcode_above.drawio diff --git a/chapters/exploitation-techniques/shellcodes/assets/shellcode_above.png b/chapters/exploitation-techniques/shellcodes/media/shellcode_above.png similarity index 100% rename from chapters/exploitation-techniques/shellcodes/assets/shellcode_above.png rename to chapters/exploitation-techniques/shellcodes/media/shellcode_above.png diff --git a/chapters/exploitation-techniques/shellcodes/assets/shellcode_below.drawio b/chapters/exploitation-techniques/shellcodes/media/shellcode_below.drawio similarity index 100% rename from chapters/exploitation-techniques/shellcodes/assets/shellcode_below.drawio rename to chapters/exploitation-techniques/shellcodes/media/shellcode_below.drawio diff --git a/chapters/exploitation-techniques/shellcodes/assets/shellcode_below.png b/chapters/exploitation-techniques/shellcodes/media/shellcode_below.png similarity index 100% rename from chapters/exploitation-techniques/shellcodes/assets/shellcode_below.png rename to chapters/exploitation-techniques/shellcodes/media/shellcode_below.png diff --git a/chapters/exploitation-techniques/shellcodes/assets/stack_buffer.png b/chapters/exploitation-techniques/shellcodes/media/stack_buffer.png similarity index 100% rename from chapters/exploitation-techniques/shellcodes/assets/stack_buffer.png rename to chapters/exploitation-techniques/shellcodes/media/stack_buffer.png diff --git a/chapters/exploitation-techniques/shellcodes/README.md b/chapters/exploitation-techniques/shellcodes/reading/README.md similarity index 100% rename from chapters/exploitation-techniques/shellcodes/README.md rename to chapters/exploitation-techniques/shellcodes/reading/README.md diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/Makefile b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/Makefile similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/Makefile rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/Makefile diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/exploit.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/exploit.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/exploit.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/exploit.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/01-tutorial-bypass-dep-system-sh-present/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/01-tutorial-bypass-dep-system-sh-present/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/Makefile b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/Makefile similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/Makefile rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/Makefile diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/exploit.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/exploit.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/exploit.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/exploit.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/02-tutorial-bypass-dep-system-sh-separate/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/02-tutorial-bypass-dep-system-sh-separate/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/Makefile b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/Makefile similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/Makefile rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/Makefile diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/README.md b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/README.md similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/README.md rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/README.md diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/03-tutorial-bypass-dep-no-aslr-libc/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/03-tutorial-bypass-dep-no-aslr-libc/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/Makefile b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/Makefile similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/Makefile rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/Makefile diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/exploit.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/exploit.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/exploit.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/exploit.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/04-tutorial-bypass-dep-aslr-libc/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/04-tutorial-bypass-dep-aslr-libc/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/ld-linux.so.2 b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/ld-linux.so.2 similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/ld-linux.so.2 rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/ld-linux.so.2 diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/libc.so.6 diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/rwslotmachine7 b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/rwslotmachine7 similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/rwslotmachine7 rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/rwslotmachine7 diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/sol_pie_bypass.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/sol_pie_bypass.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/05-tutorial-bypass-dep-aslr-pie-rop/sol_pie_bypass.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/05-tutorial-bypass-dep-aslr-pie-rop/sol_pie_bypass.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/sol/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/sol/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/sol/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/sol/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/sol/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/sol/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/sol/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/sol/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/src/vuln b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/src/vuln similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/06-challenge-bypass-dep-system-sh-present/src/vuln rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/06-challenge-bypass-dep-system-sh-present/src/vuln diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/sol/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/sol/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/sol/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/sol/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/sol/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/sol/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/sol/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/sol/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/src/vuln b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/src/vuln similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/07-challenge-bypass-dep-system-sh-separate/src/vuln rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/07-challenge-bypass-dep-system-sh-separate/src/vuln diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/README.md b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/README.md similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/README.md rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/README.md diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/sol/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/sol/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/sol/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/sol/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/sol/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/src/vuln b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/src/vuln similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/08-challenge-bypass-dep-no-aslr-libc/src/vuln rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/08-challenge-bypass-dep-no-aslr-libc/src/vuln diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/.gitignore b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/.gitignore similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/.gitignore rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/.gitignore diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/README.md b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/README.md similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/README.md rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/README.md diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/sol/exploit3.py b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/sol/exploit3.py similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/sol/exploit3.py rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/sol/exploit3.py diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/sol/vuln.c b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/sol/vuln.c similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/sol/vuln.c rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/sol/vuln.c diff --git a/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/src/vuln b/chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/src/vuln similarity index 100% rename from chapters/mitigations-and-defensive-strategies/bypassing-mitigations/activities/09-challenge-bypass-dep-aslr-libc/src/vuln rename to chapters/mitigations-and-defensive-strategies/bypassing-mitigations/drills/09-challenge-bypass-dep-aslr-libc/src/vuln diff --git a/chapters/mitigations-and-defensive-strategies/defense-mechanisms/README.md b/chapters/mitigations-and-defensive-strategies/defense-mechanisms/reading/README.md similarity index 100% rename from chapters/mitigations-and-defensive-strategies/defense-mechanisms/README.md rename to chapters/mitigations-and-defensive-strategies/defense-mechanisms/reading/README.md diff --git a/chapters/mitigations-and-defensive-strategies/information-leaks/README.md b/chapters/mitigations-and-defensive-strategies/information-leaks/reading/README.md similarity index 100% rename from chapters/mitigations-and-defensive-strategies/information-leaks/README.md rename to chapters/mitigations-and-defensive-strategies/information-leaks/reading/README.md