From c3bf2181e6807e0ba5ef8997e2897730c25c6306 Mon Sep 17 00:00:00 2001 From: firmianay Date: Mon, 19 Mar 2018 12:33:57 +0800 Subject: [PATCH] add chapter 8 academic --- SUMMARY.md | 17 ++++++++++------- ...1_return-into-libc_without_function_calls.md | 1 + ...turn-oriented_programming_without_returns.md | 1 + doc/8_academic.md | 8 ++++++++ doc/8_appendix.md | 8 -------- doc/{8.1_Linuxtools.md => 9.1_Linuxtools.md} | 2 +- doc/{8.2_wintools.md => 9.2_wintools.md} | 2 +- doc/{8.3_books&blogs.md => 9.3_books_blogs.md} | 2 +- doc/{8.5_syscall.md => 9.4_linux_syscall.md} | 2 +- doc/{8.6_slides.md => 9.5_slides.md} | 2 +- doc/9_appendix.md | 7 +++++++ 11 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 doc/8.1_return-into-libc_without_function_calls.md create mode 100644 doc/8.2_return-oriented_programming_without_returns.md create mode 100644 doc/8_academic.md delete mode 100644 doc/8_appendix.md rename doc/{8.1_Linuxtools.md => 9.1_Linuxtools.md} (99%) rename doc/{8.2_wintools.md => 9.2_wintools.md} (97%) rename doc/{8.3_books&blogs.md => 9.3_books_blogs.md} (99%) rename doc/{8.5_syscall.md => 9.4_linux_syscall.md} (66%) rename doc/{8.6_slides.md => 9.5_slides.md} (91%) create mode 100644 doc/9_appendix.md diff --git a/SUMMARY.md b/SUMMARY.md index 0121f0d..794ebeb 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -140,10 +140,13 @@ GitHub 地址：https://github.com/firmianay/CTF-All-In-One * [7.1.7 [CVE-2018-6323] GNU binutils 2.26.1 Integer Overflow](doc/7.1.7_binutils_2018-6323.md) * Malware * 7.2.x -* [八、附录](doc/8_appendix.md) - * [8.1 更多 Linux 工具](doc/8.1_Linuxtools.md) - * [8.2 更多 Windows 工具](doc/8.2_wintools.md) - * [8.3 更多资源](doc/8.3_books&blogs.md) - * 8.4 - * [8.5 Linux x86-64 系统调用表](doc/8.5_syscall.md) - * [8.6 幻灯片](doc/8.6_slides.md) +* [八、学术篇](doc/8_academic.md) + * Return-Oriented Programming + * [8.1 The Geometry of Innocent Flesh on the Bone: Return-into-libc without Function Calls (on the x86)](doc/8.1_return-into-libc_without_function_calls.md) + * [8.2 Return-Oriented Programming without Returns](doc/8.2_return-oriented_programming_without_returns.md) +* [九、附录](doc/9_appendix.md) + * [9.1 更多 Linux 工具](doc/9.1_Linuxtools.md) + * [9.2 更多 Windows 工具](doc/9.2_wintools.md) + * [9.3 更多资源](doc/9.3_books_blogs.md) + * [9.4 Linux x86-64 系统调用表](doc/9.4_linux_syscall.md) + * [9.5 幻灯片](doc/9.5_slides.md) diff --git a/doc/8.1_return-into-libc_without_function_calls.md b/doc/8.1_return-into-libc_without_function_calls.md new file mode 100644 index 0000000..3294c85 --- /dev/null +++ b/doc/8.1_return-into-libc_without_function_calls.md @@ -0,0 +1 @@ +# 8.1 The Geometry of Innocent Flesh on the Bone: Return-into-libc without Function Calls (on the x86) diff --git a/doc/8.2_return-oriented_programming_without_returns.md b/doc/8.2_return-oriented_programming_without_returns.md new file mode 100644 index 0000000..f07f44c --- /dev/null +++ b/doc/8.2_return-oriented_programming_without_returns.md @@ -0,0 +1 @@ +# 8.2 Return-Oriented Programming without Returns diff --git a/doc/8_academic.md b/doc/8_academic.md new file mode 100644 index 0000000..d3d0ecd --- /dev/null +++ b/doc/8_academic.md @@ -0,0 +1,8 @@ +# 第八章 学术篇 + +论文下载： +链接：https://pan.baidu.com/s/1G-WFCzAU2VdrrsHqJzjGpw 密码：vhfw + +* Return-Oriented Programming + * [8.1 The Geometry of Innocent Flesh on the Bone: Return-into-libc without Function Calls (on the x86)](8.1_return-into-libc_without_function_calls.md) + * [8.2 Return-Oriented Programming without Returns](8.2_return-oriented_programming_without_returns.md) diff --git a/doc/8_appendix.md b/doc/8_appendix.md deleted file mode 100644 index 2a3b616..0000000 --- a/doc/8_appendix.md +++ /dev/null @@ -1,8 +0,0 @@ -# 第八章 附录 - -- [8.1 更多 Linux 工具](8.1_Linuxtools.md) -- [8.2 更多 Windows 工具](8.2_wintools.md) -- [8.3 更多资源](8.3_books&blogs.md) -- 8.4 -- [8.5 Linux x86-64 系统调用表](8.5_syscall.md) -- [8.6 幻灯片](8.6_slides.md) diff --git a/doc/8.1_Linuxtools.md b/doc/9.1_Linuxtools.md similarity index 99% rename from doc/8.1_Linuxtools.md rename to doc/9.1_Linuxtools.md index c28140d..a538552 100644 --- a/doc/8.1_Linuxtools.md +++ b/doc/9.1_Linuxtools.md @@ -1,4 +1,4 @@ -# 8.1 更多 Linux 工具 +# 9.1 更多 Linux 工具 - [dd](#dd) - [file](#file) diff --git a/doc/8.2_wintools.md b/doc/9.2_wintools.md similarity index 97% rename from doc/8.2_wintools.md rename to doc/9.2_wintools.md index 67911e9..8e087a6 100644 --- a/doc/8.2_wintools.md +++ b/doc/9.2_wintools.md @@ -1,4 +1,4 @@ -# 8.2 更多 Windows 工具 +# 9.2 更多 Windows 工具 - [010 Editor](#010-editor) - [DIE](#die) diff --git a/doc/8.3_books&blogs.md b/doc/9.3_books_blogs.md similarity index 99% rename from doc/8.3_books&blogs.md rename to doc/9.3_books_blogs.md index bed2850..58d7afa 100644 --- a/doc/8.3_books&blogs.md +++ b/doc/9.3_books_blogs.md @@ -1,4 +1,4 @@ -# 8.3 更多资源 +# 9.3 更多资源 - [课程](#课程) - [站点](#站点) diff --git a/doc/8.5_syscall.md b/doc/9.4_linux_syscall.md similarity index 66% rename from doc/8.5_syscall.md rename to doc/9.4_linux_syscall.md index bf06867..574a324 100644 --- a/doc/8.5_syscall.md +++ b/doc/9.4_linux_syscall.md @@ -1,3 +1,3 @@ -# 8.5 Linux x86-64 系统调用表 +# 9.4 Linux x86-64 系统调用表 http://blog.rchapman.org/posts/Linux_System_Call_Table_for_x86_64/ diff --git a/doc/8.6_slides.md b/doc/9.5_slides.md similarity index 91% rename from doc/8.6_slides.md rename to doc/9.5_slides.md index f62c719..34a5970 100644 --- a/doc/8.6_slides.md +++ b/doc/9.5_slides.md @@ -1,4 +1,4 @@ -# 8.6 幻灯片 +# 9.5 幻灯片 这些是我在 XDSEC 做分享的 PPT，主要内容取自 CTF-All-In-One，可作为辅助学习。 diff --git a/doc/9_appendix.md b/doc/9_appendix.md new file mode 100644 index 0000000..86c181f --- /dev/null +++ b/doc/9_appendix.md @@ -0,0 +1,7 @@ +# 第九章 附录 + +* [9.1 更多 Linux 工具](9.1_Linuxtools.md) +* [9.2 更多 Windows 工具](9.2_wintools.md) +* [9.3 更多资源](9.3_books_blogs.md) +* [9.4 Linux x86-64 系统调用表](9.4_linux_syscall.md) +* [9.5 幻灯片](9.5_slides.md)