Merge branch 'master' of https://github.com/skyf0l/CTF

skyf0l · Jun 17, 2020 · e23d37a · e23d37a
2 parents d7c41f3 + 8bd5714
commit e23d37a
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/NahamCon_2020/README.md b/NahamCon_2020/README.md
@@ -0,0 +1,44 @@
+# NahamCon CTF 2020
+
+June 12th 8:00 AM PDT - June 13th - 3:00 PM PDT 31-Hour Competition
+
+**Finished 157th on 2854 with 2060 points**
+
+## Write-ups by categories:
+
+* [Warmup](Warmup.md)
+  - [Read The Rules](Warmup.md#read-the-rules) (5)
+  - [CLIsay](Warmup.md#clisay) (20)
+  - [Metameme](Warmup.md#metameme) (25)
+  - [Mr. Robot](Warmup.md#mr-robot) (25)
+  - [UGGC](Warmup.md#uggc) (30)
+  - [Peter Rabbit](Warmup.md#peter-rabbit) (40)
+  - [Pang](Warmup.md#pang) (40)
+
+* [Cryptography](Cryptography.md)
+  - [Twinning](Cryptography.md#twinning) (100)
+  - [Ooo-la-la](Cryptography.md#ooo-la-la) (100)
+  - [December](Cryptography.md#december) (125)
+
+* [Forensics](Forensics.md)
+  - [Microsooft](Forensics.md#microsooft) (100)
+  - [Volatile](Forensics.md#volatile) (125)
+  - [Cow Pie](Forensics.md#cow-pie) (125)
+
+* [Scripting](Scripting)
+  - [Rotten](Scripting/rotten.py) (100)
+  - [Really Powerful Gnomes](Scripting/really_powerful_gnomes.py) (150)
+
+* [Miscellaneous](Miscellaneous.md)
+  - [Vortex](Miscellaneous.md#vortex) (75)
+  - [Fake File](Miscellaneous.md#vortex) (100)
+  - [Alkatraz](Miscellaneous.md#alkatraz) (100)
+
+* [Mobile](Mobile.md)
+  - [Candroid](Mobile.md#candroid) (50)
+  - [Simple App](Mobile.md#simple-app) (50)
+  - [Secure Safe](Mobile.md#secure-safe) (100)
+
+* [Web](Web.md)
+  - [Agent 95](Web.md#agent-95) (50)
+  - [Localghost](Web.md#localghost) (75)
diff --git a/NahamCon_2020/Web.md b/NahamCon_2020/Web.md
@@ -1,4 +1,6 @@
 # Web
+
+## Agent 95
 ```
 They've given you a number, and taken away your name~