Neale Pickett
a79c87648d
Some p2 changes
2012-12-18 10:15:08 -07:00
Neale Pickett
d5d7fc8691
puzzles.cgi from novar branch
2012-07-26 19:28:29 -06:00
Neale Pickett
d0ff2c2156
add bus. card puzzle, mention radio on index
2012-07-26 19:25:36 -06:00
Neale Pickett
84fe59d47a
Merge answers from novar for p2@dc20
2012-07-26 17:57:33 -06:00
Neale Pickett
29f0f0c805
nyancat part of DJ puzzle
2012-07-23 23:03:26 -06:00
Neale Pickett
dc8f9ed513
Merge branch 'master' of fozzie:projects/ctf
2012-07-23 20:35:02 -06:00
Neale Pickett
6a7ada8382
add answers for radio
2012-07-23 20:34:48 -06:00
Neale Pickett
07060e937c
add network disclaimer to p2 page
2012-07-20 15:35:20 -06:00
Neale Pickett
93084076fa
a few changes for HACK
2012-07-16 17:46:27 -06:00
Neale Pickett
4ffb76b661
lots of little fixups, caught up with todo after trail run in ACS
2012-07-12 17:15:43 -06:00
Neale Pickett
d9e4ba9e41
fix routing for p2
2012-07-12 16:55:36 -06:00
Neale Pickett
b1d0ba94e5
add gs service, use new eris command-line option
2012-07-02 18:21:00 -06:00
Neale Pickett
182b4ac23f
add p2.xcf
2012-06-27 14:41:52 -06:00
Neale Pickett
b918b27da3
Add generalstatics category
2012-06-27 14:40:51 -06:00
Neale Pickett
990549b2cb
add 2012 generalstatics.com site
2012-06-27 13:46:32 -06:00
Neale Pickett
622ed71052
Add category to URL in puzzles.cgi
2012-06-13 11:37:13 -06:00
Aaron McPhall
2db81def0d
Fixed my mistakes on puzzles.cgi.c
2012-06-13 13:31:14 -04:00
Neale Pickett
f1872cf6ba
Move var decl in puzzles.cgi.c to work with older C
2012-06-13 11:23:16 -06:00
Neale Pickett
6e0b12fe9f
pointscli no longer fails on success
2012-06-13 11:11:26 -06:00
Neale Pickett
2c6f2fbabf
map handles to RL names for mcp
2012-06-13 10:48:55 -06:00
Neale Pickett
9a7fea046c
Make P2 use its own www directory
2012-06-12 21:07:56 -06:00
Neale Pickett
1540904f3e
disable p2cli screen black (thanks slackish)
2012-06-12 19:48:19 -06:00
Neale Pickett
78a67e9ab3
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
af554eb3e6
Working, tested p2 console
2012-06-11 14:37:39 -06:00
Neale Pickett
bdc8452220
Start at p2 server package
2012-06-09 16:11:23 -06:00
Neale Pickett
49b360b71f
Make fire-ip accept v4 or v6 IPs
2012-06-09 15:55:02 -06:00
Neale Pickett
38886dbdaf
s/sbin/bin/ for fire-ip
2012-06-09 15:50:45 -06:00
Neale Pickett
df1a1811a5
p2client package
2012-06-09 14:42:46 -06:00
Aaron J. McPhall
216fd11b18
Updated p2 scoreboard to include helpful text. will need some positioning later though
2012-06-08 16:08:07 -06:00
Neale Pickett
edf7a9bdf6
simplify duplicate line check in pointsd
2012-06-06 22:13:49 -06:00
Neale Pickett
39d0828f4b
working p2 scoreboard
2012-06-06 22:11:54 -06:00
Neale Pickett
a5c625a34a
more p2 scoreboard work
2012-06-06 17:51:37 -06:00
Neale Pickett
1f87afa4e5
work on p2 scoreboard
2012-06-06 14:55:09 -06:00
Neale Pickett
ef3a0a6b74
Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
2012-06-06 11:36:20 -06:00
Neale Pickett
3f94e8de84
ignore printf build warnings
2012-06-06 00:03:40 -06:00
Neale Pickett
6eb08c33ae
merge backup into pointsd
2012-06-05 23:56:29 -06:00
Neale Pickett
6725487d2a
avoid duplicates in points.log
2012-06-05 16:55:58 -06:00
Neale Pickett
9949705fc9
Merge remote-tracking branch 'fozzie/master'
2012-06-01 10:58:32 -06:00
Neale Pickett
39c03fea97
Add TEA encryption tool
2012-05-31 23:09:01 -06:00
Neale Pickett
2bcdc8e901
Tanks using new architectuer
2012-05-31 13:57:34 -06:00
Neale Pickett
62282483ad
Bring arc4 back in
2012-05-31 13:52:23 -06:00
Aaron McPhall
e8a56ba418
State of competition can now happen in the cloud
2012-05-31 00:29:36 -04:00
Aaron J. McPhall
c1fa983fc7
Merge branch 'master' of woozle.org:~neale/projects/ctf
2012-05-30 18:28:38 -06:00
Neale Pickett
1e49d8114d
Have claim.cgi look in $STATE/tokens.db again
2012-05-30 18:10:04 -06:00
Aaron J. McPhall
b8d3d3d0ad
Fixed the build
2012-05-30 18:09:51 -06:00
Neale Pickett
6326001669
Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
2012-05-30 18:04:32 -06:00
Neale Pickett
87557bb0d0
move mcp to new points architecture
2012-05-30 18:04:24 -06:00
Aaron J. McPhall
316fff4679
updates to parsing on puzzles.cgi
2012-05-30 13:51:40 -06:00
Aaron J. McPhall
66fa312652
Merge branch 'master' of woozle.org:~neale/projects/ctf
2012-05-30 12:21:11 -06:00
Aaron J. McPhall
7c1c2e4ec2
puzzles.cgi now inspects map files
2012-05-30 12:19:07 -06:00