Commit Graph

2092 Commits

Author SHA1 Message Date
Neale Pickett 939514d9f7 Merge branch 'master' from laptop
Conflicts:

	doc/ideas.txt
	pwnables/service/sshd.pwn/run
2010-10-22 11:30:58 -06:00
Neale Pickett 4c4656ede0 A couple fixes made during NSM 2010-10-22 11:15:37 -06:00
Neale Pickett 0444d8c541 Add missing keys 2010-10-22 11:04:04 -06:00
Neale Pickett 5a2caae951 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2010-10-22 09:37:02 -06:00
Neale Pickett 4b4e74386e Fix a few bugs 2010-10-22 09:36:28 -06:00
Neale Pickett 637545aa9a Make puzzles first class categories 2010-10-21 22:15:18 -06:00
Neale Pickett ab18a9b4d6 Add OpenWRT VLAN config 2010-10-21 16:06:24 -06:00
Neale Pickett 7fba5155b1 Fix up steg and net-re 2010-10-12 16:58:34 -06:00
Neale Pickett ea00976e68 Fix everything I found on Thursday 2010-10-09 23:52:33 -06:00
Neale Pickett ea2d50a270 Finalize logger, back to mathopd 2010-10-09 18:13:01 -06:00
Neale Pickett b04979ea77 Add steg and logger (neither work yet) 2010-10-06 17:20:00 -06:00
Neale Pickett 8c0ed9e471 Add printf category, plus a better stream cipher (unused) 2010-10-05 11:55:32 -06:00
Neale Pickett 2c35855b05 Add logger program 2010-10-01 15:02:16 -06:00
Neale Pickett 2532fe5e43 I think everything's working...
* Octopus changes
* Change how things start a little (hopefully cleaner)
* Fix bubblebabble bug
* other junk, I don't know
2010-09-29 17:38:54 -06:00
Neale Pickett e002f16618 Start trying to get token distribution working 2010-09-27 21:03:10 -06:00
Neale Pickett 5fba528be5 Start talking about tokens 2010-09-27 09:02:54 -06:00
Neale Pickett d6f6d27b0f Bring over octopus solution 2010-09-26 21:56:51 -06:00
Neale Pickett 48caa26556 Add in pwnables, start at octopus & tokencli 2010-09-26 21:54:31 -06:00
Neale Pickett e46bff58d0 Debug puzzles, add them all in 2010-09-24 22:28:40 -06:00
Neale Pickett 89ebd469d7 Add in puzzles
Also, modularize the build.  This is now a single project for all CTF
packages.
2010-09-24 17:24:43 -06:00
Neale Pickett 6256b7da77 Lotsa bugfixes 2010-09-23 23:27:14 -06:00
Neale Pickett ea1653cf03 Fix permissions, make separate log file for claim
Whups :)
2010-09-23 19:11:52 -06:00
Neale Pickett 8e25c9f074 Merge in nonce work I did at home
Conflicts:
	mcp/src/claim.cgi.c
	mcp/src/common.c
	mcp/src/in.tokend.c
	mcp/src/puzzler.cgi.c
	mcp/src/puzzles.cgi.c
	mcp/src/xxtea.c
	mcp/src/xxtea.h
2010-09-23 18:30:40 -06:00
Neale Pickett 48c6ca0aa2 Modularize + lots of fixes 2010-09-23 18:23:00 -06:00
Neale Pickett c246ad4d75 Merge branch 'master'; commit 'origin/master' 2010-09-23 11:01:30 -06:00
Neale Pickett 8d8ea21250 Another tweak to FS structure 2010-09-22 21:12:24 -06:00
Neale Pickett edf695a35e Make arc4 more streamy 2010-09-21 21:59:49 -06:00
Neale Pickett e730b0766d Add tokencli, add nonce to token protocol 2010-09-18 21:56:57 -06:00
Neale Pickett 2f3634167b I misread man sprintf; corrected 2010-09-16 23:53:31 -06:00
Neale Pickett 4d981756ce Move from xxtea to arc4
arc4 has known attacks, but you need a lot of data first.  More data
that we'll have tokens.
2010-09-16 23:18:16 -06:00
Neale Pickett cf282dff48 I found %*s in printf! Converting... 2010-09-16 17:11:55 -06:00
Neale Pickett 7305ae79cb -Werror 2010-09-16 12:21:16 -06:00
Neale Pickett 487893c314 Take scanf out of puzzles.cgi 2010-09-16 12:20:44 -06:00
Neale Pickett 04d3c2c66c Results of code review 2010-09-14 18:04:33 -06:00
Neale Pickett bbd4405491 Make test errors stand out more 2010-09-13 17:34:54 -06:00
Neale Pickett 7e4f523347 Remove more cruft, add polish 2010-09-13 17:32:51 -06:00
Neale Pickett 14d7e3509d Add some online docs, clean up some cruft 2010-09-13 16:58:30 -06:00
Neale Pickett 8d47593986 Many changes, unit test
* Everything in /srv/ctf now, set $CTF_BASE to override that
* CGI now accepts parms in argv
* Fix bug with uninitialized CGI vars
2010-09-13 12:23:39 -06:00
Neale Pickett 507dd93d88 Add note about static page generation 2010-09-12 22:34:42 -06:00
Neale Pickett 23b6f28a21 Make puzzles generate static HTML 2010-09-12 22:15:06 -06:00
Neale Pickett 61e6984777 Add puzzles CGI
I just realized I don't need this to be a CGI.
2010-09-12 22:01:21 -06:00
Neale Pickett df3da9c6d3 Make points a long 2010-09-12 22:00:58 -06:00
Neale Pickett 5199cf5cac Move CGI routines into common.c
They're still good general-purpose routines, though.
2010-09-11 23:22:28 -06:00
Neale Pickett c3bf43b132 Add puzzler.cgi, put more into common.c 2010-09-11 22:57:46 -06:00
Neale Pickett c9c24d9a8b Create new fgrepx common function
It's also slightly quicker.
2010-09-10 23:07:40 -06:00
Neale Pickett de5a53c226 Fix cycling 2010-09-09 17:08:57 -06:00
Neale Pickett 7aa23aadb5 Have cycling option for scoreboard 2010-09-09 16:51:11 -06:00
Neale Pickett fd8f53dae3 Store colors on disk & more 2010-09-09 15:14:39 -06:00
Neale Pickett 4bc5ba6eb3 Clean up points display 2010-09-08 22:19:48 -06:00
Neale Pickett b85d328a62 Widen scoreboard page (untested) 2010-09-08 21:55:28 -06:00