Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	ekoparty-ctf-2016/README.md
	ekoparty-ctf-2016/forensics/certified-excel-hacker-50/README.md
	ekoparty-ctf-2016/misc/lsso-200/README.md
  • Loading branch information
Thomas Gerot committed Nov 7, 2016
2 parents 9f963f4 + 7d42802 commit 740c439
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ekoparty-ctf-2016/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
* [pwning/ultra-baby-25](pwning/ultra-baby-25)
* [web/url-shortener-200](web/url-shortener-200)
* [misc/old-but-gold-250](misc/old-but-gold-250)
* [misc/lsso-200](misc/lsso-200)
* [reversing/old-times-100](reversing/old-times-100)
* [reversing/rreeggeexx-75](reversing/rreeggeexx-75)
* [reversing/back-again-150](reversing/back-again-150)
* [misc/the-fake-satoshi-300](misc/the-fake-satoshi-300)
* [misc/congested-service-100](misc/congested-service-100)
* [forensics/vsftpd-dejavu-150](forensics/vsftpd-dejavu-150)
* [forensics/knock-knock-125](forensics/knock-knock-125)
* [pwning/fuckzing-exploit-200](pwning/fuckzing-exploit-200)
* [reversing/malware-sample-400](reversing/malware-sample-400)
* [pwning/my-first-service-i-100](pwning/my-first-service-i-100)
Expand All @@ -45,7 +47,6 @@

* [reversing/quacks-like-a-duck-200](reversing/quacks-like-a-duck-200)
* [forensics/alice-secret-message-175](forensics/alice-secret-message-175)
* [forensics/knock-knock-125](forensics/knock-knock-125)
* [pwning/bubble-250](pwning/bubble-250)
* [fbi/i2p-node-checker-tool-400](fbi/i2p-node-checker-tool-400)
* [fbi/silk-road-4-500](fbi/silk-road-4-500)
Expand Down
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/fbi/find-me-100/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
## Other write-ups and resources

* http://blog.dragonsector.pl/2016/10/ekoparty-ctf-2016-fbi-100.html
* https://penafieljlm.wordpress.com/2016/10/29/ekoparty-ctf-2016-write-ups/#fbi-100
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/forensics/certified-excel-hacker-50/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
* https://0day.work/ekoparty-ctf-2016-writeups/
* https://github.com/Idomin/CTF-Writeups/tree/master/EKOCTF-2016
* https://github.com/burlingpwn/writeups/tree/master/EKOPARTY-CTF-2016/Reversing/Back%20again
* https://github.com/pwning/public-writeup/tree/master/ekoparty2016/for50-certified-excel-hacker
* https://github.com/vest12385/EKOPARTY-2016/tree/master/Forensics/Certified%20Excel%20Hacker%20-%2050
3 changes: 3 additions & 0 deletions ekoparty-ctf-2016/forensics/hacker-in-disguise-100/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@

* https://piggybird.net/2016/10/ekoparty-2016-write-hacker-disguise-100/
* https://github.com/p4-team/ctf/blob/master/2016-10-26-ekoparty/for_100/README.md
* https://github.com/fgvxf/ctf/blob/master/2016-10-26-ekoparty/forensics-100/README.md
* https://ctftime.org/writeup/4606
* https://github.com/pwning/public-writeup/tree/master/ekoparty2016/for100-hacker-in-disguise
2 changes: 1 addition & 1 deletion ekoparty-ctf-2016/forensics/knock-knock-125/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

## Other write-ups and resources

* none yet
* https://github.com/fgvxf/ctf/blob/master/2016-10-26-ekoparty/forensics-125/README.md
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/misc/lsso-200/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
## Other write-ups and resources

* https://github.com/FFCrewCTF/ctf-writeups/tree/master/2016-10-26-ekoparty/misc_200
* https://github.com/douglasqsantos/ctf-writeups/tree/master/2016-10-26-ekoparty/misc_200
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/pwning/ultra-baby-25/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
* https://nacayoshi00.wordpress.com/2016/10/28/ekoparty-ctf-2016-writeup/
* https://penafieljlm.wordpress.com/2016/10/29/ekoparty-ctf-2016-write-ups/#pwn-25
* https://github.com/burlingpwn/writeups/tree/master/EKOPARTY-CTF-2016/Pwning/Ultra%20baby
* https://specterdev.blogspot.com/2016/10/write-up-ekoparty-2016-ctf-pwning-25-50.html
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/reversing/f#ck-50/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
* https://nacayoshi00.wordpress.com/2016/10/28/ekoparty-ctf-2016-writeup/
* https://penafieljlm.wordpress.com/2016/10/29/ekoparty-ctf-2016-write-ups/#rev-50
* https://github.com/burlingpwn/writeups/tree/master/EKOPARTY-CTF-2016/Reversing/F%23ck
* https://specterdev.blogspot.com/2016/10/write-up-ekoparty-2016-ctf-reverse.html
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/reversing/jvm-25/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ print("EKO{" + str(n) + "}")
* https://github.com/Idomin/CTF-Writeups/tree/master/EKOCTF-2016
* https://nacayoshi00.wordpress.com/2016/10/28/ekoparty-ctf-2016-writeup/
* https://github.com/burlingpwn/writeups/tree/master/EKOPARTY-CTF-2016/Reversing/JVM
* https://specterdev.blogspot.com/2016/10/write-up-ekoparty-2016-ctf-reverse.html
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/reversing/rreeggeexx-75/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
* https://github.com/p4-team/ctf/tree/master/2016-10-26-ekoparty/re_50
* https://nacayoshi00.wordpress.com/2016/10/28/ekoparty-ctf-2016-writeup/
* https://github.com/burlingpwn/writeups/tree/master/EKOPARTY-CTF-2016/Reversing/RrEeGgEeXx
* https://specterdev.blogspot.in/2016/10/write-up-ekoparty-2016-ctf-reverse.html
1 change: 1 addition & 0 deletions ekoparty-ctf-2016/web/carder-150/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
* https://0day.work/ekoparty-ctf-2016-writeups/
* https://github.com/p4-team/ctf/blob/master/2016-10-26-ekoparty/web_150/README.md
* https://github.com/team-bitskrieg/CTF-writeups/tree/master/EKOctf/web/150-carder
* https://penafieljlm.wordpress.com/2016/10/29/ekoparty-ctf-2016-write-ups/#web-150
1 change: 1 addition & 0 deletions tum-ctf-2016/crypto/haggis-100/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@

* https://ctftime.org/writeup/4290
* http://duksctf.github.io/TUMCTF2016-haggis/
* http://uss.informatik.uni-ulm.de/?p=492
1 change: 1 addition & 0 deletions tum-ctf-2016/stego/the-joy-of-painting-50/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

* http://duksctf.github.io/TUMCTF2016-thejoyofpainting/
* https://github.com/p4-team/ctf/tree/master/2016-10-01-tum/joy_stegano_50
* https://uss.informatik.uni-ulm.de/?p=492
1 change: 1 addition & 0 deletions tum-ctf-2016/web/free-as-in-bavarian-beer-50/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

* https://losfuzzys.github.io/writeup/2016/10/02/tumctf-web50/
* https://dinhbaoluciusteam.wordpress.com/2016/10/02/web-free_as_in_bavarian_beer-tumctf
* https://uss.informatik.uni-ulm.de/?p=492

0 comments on commit 740c439

Please sign in to comment.