From 6b082f13dccd72c513792ba0dd03d70bced5ca5d Mon Sep 17 00:00:00 2001 From: firmianay Date: Sun, 5 Nov 2017 17:21:02 +0800 Subject: [PATCH] add new chapter 6 --- CONTRIBUTION.md | 1 + README.md | 17 ++++++++++------- SUMMARY.md | 15 ++++++++------- doc/6_appendix.md | 8 -------- doc/6_writeup.md | 1 + doc/{6.1_Linuxtools.md => 7.1_Linuxtools.md} | 2 +- doc/{6.2_wintools.md => 7.2_wintools.md} | 2 +- doc/{6.3_books&blogs.md => 7.3_books&blogs.md} | 2 +- doc/{6.4_writeup.md => 7.4_writeup.md} | 2 +- doc/{6.5_syscall.md => 7.5_syscall.md} | 3 ++- doc/{6.6_ppt.md => 7.6_ppt.md} | 2 +- doc/7_appendix.md | 8 ++++++++ src/writeup/init.md | 0 13 files changed, 35 insertions(+), 28 deletions(-) delete mode 100644 doc/6_appendix.md create mode 100644 doc/6_writeup.md rename doc/{6.1_Linuxtools.md => 7.1_Linuxtools.md} (99%) rename doc/{6.2_wintools.md => 7.2_wintools.md} (97%) rename doc/{6.3_books&blogs.md => 7.3_books&blogs.md} (99%) rename doc/{6.4_writeup.md => 7.4_writeup.md} (99%) rename doc/{6.5_syscall.md => 7.5_syscall.md} (65%) rename doc/{6.6_ppt.md => 7.6_ppt.md} (94%) create mode 100644 doc/7_appendix.md create mode 100644 src/writeup/init.md diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md index ab47129..1f11e10 100644 --- a/CONTRIBUTION.md +++ b/CONTRIBUTION.md @@ -47,6 +47,7 @@ - 每个章节开头需要有一个目录，增加或删除内容时需要做相应的修改，关于 GitHub 独特的页面跳转写法请参考 [Page Jumping in Github](https://github.com/firmianay/Life-long-Learner/blob/master/misc/github-tips.md#page-jumping-in-github)。 - [中文文案排版指北](https://github.com/sparanoid/chinese-copywriting-guidelines) - 如果你新添加一个章节，需要在 **README.md**、**SUMMARY.md** 和章节所属部分相应的文件中添加条目。 +- 新增第六章题解篇，收集各种好题的Writeup，应力求详细，且能提供源程序供实际操作，一个md只写一题，源程序上传到文件夹`src/writeup`，题目最好来自 [CTFs](https://github.com/ctfs)。 | 章节 | 作者 | 进度 | diff --git a/README.md b/README.md index d378d2e..18ec3f5 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ - [1.7.2 Dalvik 指令集](doc/1.7.2_dalvik.md) - [1.7.3 ARM 汇编基础](doc/1.7.3_arm.md) - [1.7.4 Android 常用工具](doc/1.7.4_android_tools.md) + - [二、工具篇](doc/2_tools.md) - [2.1 VM](doc/2.1_vm.md) - [2.2 gdb/peda](doc/2.2_gdb&peda.md) @@ -63,13 +64,15 @@ - [5.6 LLVM](doc/5.6_llvm.md) - [5.7 Capstone/Keystone](doc/5.7_cap-keystone.md) -- [六、附录](doc/6_appendix.md) - - [6.1 更多 Linux 工具](doc/6.1_Linuxtools.md) - - [6.2 更多 Windows 工具](doc/6.2_wintools.md) - - [6.3 更多资源](doc/6.3_books&blogs.md) - - [6.4 习题 write-up](doc/6.4_writeup.md) - - [6.5 Linux x86-64 系统调用表](doc/6.5_syscall.md) - - [6.6 PPT](doc/6.6_ppt.md) +- [六、题解篇](doc/6_writeup.md) + +- [七、附录](doc/7_appendix.md) + - [7.1 更多 Linux 工具](doc/7.1_Linuxtools.md) + - [7.2 更多 Windows 工具](doc/7.2_wintools.md) + - [7.3 更多资源](doc/7.3_books&blogs.md) + - [7.4 习题 write-up](doc/7.4_writeup.md) + - [7.5 Linux x86-64 系统调用表](doc/7.5_syscall.md) + - [7.6 PPT](doc/7.6_ppt.md) 合作和贡献 diff --git a/SUMMARY.md b/SUMMARY.md index b9a1077..00819a3 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -60,10 +60,11 @@ * [5.5 符号执行](doc/5.5_symbolic.md) * [5.6 LLVM](doc/5.6_llvm.md) * [5.7 Capstone/Keystone](doc/5.7_cap-keystone.md) -* [六、附录](doc/6_appendix.md) - * [6.1 更多 Linux 工具](doc/6.1_Linuxtools.md) - * [6.2 更多 Windows 工具](doc/6.2_wintools.md) - * [6.3 更多资源](doc/6.3_books&blogs.md) - * [6.4 习题 write-up](doc/6.4_writeup.md) - * [6.5 Linux x86-64 系统调用表](doc/6.5_syscall.md) - * [6.6 PPT](doc/6.6_ppt.md) +* [六、题解篇](doc/6_writeup.md) +* [七、附录](doc/7_appendix.md) + * [7.1 更多 Linux 工具](doc/7.1_Linuxtools.md) + * [7.2 更多 Windows 工具](doc/7.2_wintools.md) + * [7.3 更多资源](doc/7.3_books&blogs.md) + * [7.4 习题 write-up](doc/7.4_writeup.md) + * [7.5 Linux x86-64 系统调用表](doc/7.5_syscall.md) + * [7.6 PPT](doc/7.6_ppt.md) diff --git a/doc/6_appendix.md b/doc/6_appendix.md deleted file mode 100644 index 9dc6fa4..0000000 --- a/doc/6_appendix.md +++ /dev/null @@ -1,8 +0,0 @@ -# 第六章 附录篇 - -- [6.1 更多 Linux 工具](6.1_Linuxtools.md) -- [6.2 更多 Windows 工具](6.2_wintools.md) -- [6.3 更多资源](6.3_books&blogs.md) -- [6.4 习题 write-up](6.4_writeup.md) -- [6.5 Linux x86-64 系统调用表](http://blog.rchapman.org/posts/Linux_System_Call_Table_for_x86_64/) -- [6.6 PPT](6.6_ppt.md) diff --git a/doc/6_writeup.md b/doc/6_writeup.md new file mode 100644 index 0000000..30e070e --- /dev/null +++ b/doc/6_writeup.md @@ -0,0 +1 @@ +# 第六章 题解篇 diff --git a/doc/6.1_Linuxtools.md b/doc/7.1_Linuxtools.md similarity index 99% rename from doc/6.1_Linuxtools.md rename to doc/7.1_Linuxtools.md index a13e938..1becf6b 100644 --- a/doc/6.1_Linuxtools.md +++ b/doc/7.1_Linuxtools.md @@ -1,4 +1,4 @@ -# 6.1 更多 Linux 工具 +# 7.1 更多 Linux 工具 - [dd](#dd) - [file](#file) diff --git a/doc/6.2_wintools.md b/doc/7.2_wintools.md similarity index 97% rename from doc/6.2_wintools.md rename to doc/7.2_wintools.md index ffba6a2..a9ce56a 100644 --- a/doc/6.2_wintools.md +++ b/doc/7.2_wintools.md @@ -1,4 +1,4 @@ -# 6.2 更多 Windows 工具 +# 7.2 更多 Windows 工具 - [010 Editor](#010-editor) - [DIE](#die) diff --git a/doc/6.3_books&blogs.md b/doc/7.3_books&blogs.md similarity index 99% rename from doc/6.3_books&blogs.md rename to doc/7.3_books&blogs.md index eb1f8a7..94ad130 100644 --- a/doc/6.3_books&blogs.md +++ b/doc/7.3_books&blogs.md @@ -1,4 +1,4 @@ -# 6.3 更多资源 +# 7.3 更多资源 - [课程](#课程) - [站点](#站点) diff --git a/doc/6.4_writeup.md b/doc/7.4_writeup.md similarity index 99% rename from doc/6.4_writeup.md rename to doc/7.4_writeup.md index b5cc61d..4aca207 100644 --- a/doc/6.4_writeup.md +++ b/doc/7.4_writeup.md @@ -1,4 +1,4 @@ -# 6.4 习题答案 +# 7.4 习题答案 - [一、基础知识篇]() - [1.3 Linux 基础]() diff --git a/doc/6.5_syscall.md b/doc/7.5_syscall.md similarity index 65% rename from doc/6.5_syscall.md rename to doc/7.5_syscall.md index 1d0dd4d..59004cf 100644 --- a/doc/6.5_syscall.md +++ b/doc/7.5_syscall.md @@ -1,2 +1,3 @@ -# 6.5 Linux x86-64 系统调用表 +# 7.5 Linux x86-64 系统调用表 + http://blog.rchapman.org/posts/Linux_System_Call_Table_for_x86_64/ diff --git a/doc/6.6_ppt.md b/doc/7.6_ppt.md similarity index 94% rename from doc/6.6_ppt.md rename to doc/7.6_ppt.md index c20dc99..a221f67 100644 --- a/doc/6.6_ppt.md +++ b/doc/7.6_ppt.md @@ -1,4 +1,4 @@ -# PPT +# 7.6 PPT 这些是我在 XDSEC 做分享的 PPT，主要内容取自 CTF-All-In-One，可作为辅助学习。 diff --git a/doc/7_appendix.md b/doc/7_appendix.md new file mode 100644 index 0000000..0280ee2 --- /dev/null +++ b/doc/7_appendix.md @@ -0,0 +1,8 @@ +# 第七章 附录篇 + +- [7.1 更多 Linux 工具](doc/7.1_Linuxtools.md) +- [7.2 更多 Windows 工具](doc/7.2_wintools.md) +- [7.3 更多资源](doc/7.3_books&blogs.md) +- [7.4 习题 write-up](doc/7.4_writeup.md) +- [7.5 Linux x86-64 系统调用表](doc/7.5_syscall.md) +- [7.6 PPT](doc/7.6_ppt.md) diff --git a/src/writeup/init.md b/src/writeup/init.md new file mode 100644 index 0000000..e69de29