Commit Graph

543 Commits

Author SHA1 Message Date
Neale Pickett 83bfc85b8d add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett a2f50998d1 a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett f99c87b01e lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett b63dbd12aa fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett ce189614b7 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 9b5bd34a47 add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 1bbd111367 Add generalstatics category 2012-06-27 14:40:51 -06:00
Neale Pickett d05062e8a2 add 2012 generalstatics.com site 2012-06-27 13:46:32 -06:00
Neale Pickett 37325b11b6 Add category to URL in puzzles.cgi 2012-06-13 11:37:13 -06:00
Aaron McPhall 18fca7fce7 Fixed my mistakes on puzzles.cgi.c 2012-06-13 13:31:14 -04:00
Neale Pickett 739fd25703 Move var decl in puzzles.cgi.c to work with older C 2012-06-13 11:23:16 -06:00
Neale Pickett dcf9328adb pointscli no longer fails on success 2012-06-13 11:11:26 -06:00
Neale Pickett 3c22ef84f5 map handles to RL names for mcp 2012-06-13 10:48:55 -06:00
Neale Pickett beefd8c2c2 Make P2 use its own www directory 2012-06-12 21:07:56 -06:00
Neale Pickett 006e9122f5 disable p2cli screen black (thanks slackish) 2012-06-12 19:48:19 -06:00
Neale Pickett 17901de534 Working p2, eliminate 00admin
This required a fair amount of shuffling stuff around, as can be seen.
Fortunately, now things ought to be able to run more or less standalone
again.

I also figured out a way to have the build system be a tad smarter about
not rebuilding shared stuff, although you still install the exact same eris
binary and /service subdirs for mcp and p2.  But at least you only have to
change one place in the source code now.
2012-06-12 18:25:32 -06:00
Neale Pickett 7bb60f45f6 Working, tested p2 console 2012-06-11 14:37:39 -06:00
Neale Pickett 9df3a506c1 Start at p2 server package 2012-06-09 16:11:23 -06:00
Neale Pickett 81b27d8ba6 Make fire-ip accept v4 or v6 IPs 2012-06-09 15:55:02 -06:00
Neale Pickett 671747540e s/sbin/bin/ for fire-ip 2012-06-09 15:50:45 -06:00
Neale Pickett 94963d52df p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 3c01edb403 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -06:00
Neale Pickett a8e9629259 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett c40e36c78e working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett aecc5471d8 more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett d2b1e404a5 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 613506f779 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett 1161227268 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 889969cec1 merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 09f361e887 avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 8109440b82 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 0d30360bbf Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 71774ce44f Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 5a4f81c68c Bring arc4 back in 2012-05-31 13:52:23 -06:00
Aaron McPhall 93c4061011 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron J. McPhall d3667d9999 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Neale Pickett cf70bb3097 Have claim.cgi look in $STATE/tokens.db again 2012-05-30 18:10:04 -06:00
Aaron J. McPhall 9e51d9ecc1 Fixed the build 2012-05-30 18:09:51 -06:00
Neale Pickett 363ceda336 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -06:00
Neale Pickett 27efe1d8cc move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Aaron J. McPhall 698c4486ae updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall 2826a69900 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -06:00
Aaron J. McPhall 9ed4dd3d52 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Neale Pickett 6a26744970 Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett fb03774655 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett 57cb1a4cdc debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett cafc0bf70a Remove more legacy junk 2012-05-25 21:39:59 -06:00
Neale Pickett 84a59868d5 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett bb5d8c02dd begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 32b8c929b5 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00