Commit Graph

474 Commits

Author SHA1 Message Date
Neale Pickett 31d2dabd93 p2client package 2012-06-09 14:42:46 -06:00
Neale Pickett df1a1811a5 p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 6a840ce832 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -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 df59d23993 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett edf7a9bdf6 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett 33bff7c82e working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett 39d0828f4b working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett 525f778ab5 more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett a5c625a34a more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett 279edda1e8 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 1f87afa4e5 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 3a578ef725 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -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 ff476fbbbb ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 3f94e8de84 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 103babad5a merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 6eb08c33ae merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 1f6975e791 avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 6725487d2a avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 50a010a9a7 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 9949705fc9 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 26360c1299 Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 39c03fea97 Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 3eab0272c6 Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 2bcdc8e901 Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 9333323003 Bring arc4 back in 2012-05-31 13:52:23 -06:00
Neale Pickett 62282483ad Bring arc4 back in 2012-05-31 13:52:23 -06:00
Aaron McPhall 1dcc03cad2 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron McPhall e8a56ba418 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron J. McPhall efb4310e57 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Aaron J. McPhall c1fa983fc7 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Neale Pickett f20084b942 Have claim.cgi look in $STATE/tokens.db again 2012-05-30 18:10:04 -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 a65f47e4b0 Fixed the build 2012-05-30 18:09:51 -06:00
Aaron J. McPhall b8d3d3d0ad Fixed the build 2012-05-30 18:09:51 -06:00
Neale Pickett db655f4b91 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -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 e0d0a927be move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Neale Pickett 87557bb0d0 move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Aaron J. McPhall fe63a771c1 updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall 316fff4679 updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall 078824aaa6 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -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 1721e1145a puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Aaron J. McPhall 7c1c2e4ec2 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Neale Pickett a52f98787f Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett 085b51e0fb Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett eddbac1f7e Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett d815b62733 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett fa9aabfe30 debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett bb4b85e9ba debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett e108ff78b0 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett 11d139f50e Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett b02f4cb896 begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett fc04d831da begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett bad7adae28 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett 1935190e26 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett 6d8bb1a926 add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett eb0c3bfe3a add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 0ff46ee25e add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett e9fc1878e8 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett b5d12437eb firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett b099999a86 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett 56a9f8a0ce make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett 649d4cab94 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett 4052dae78b Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett a85a9d5479 Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett efc97585b6 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 291cbe93f1 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett e4dec65417 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett af1c79dcf6 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett 39320e149e Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 62c508aa07 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett d54c713723 fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 5ba4875ebc fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 1945d8c2cf Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett efb0fc55fa Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett f432eee020 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 5d860c9924 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett eea456a15e fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 051c0a3fd6 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 1e6b71b0fa Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 6c39216422 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 663568e2d6 reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 656ee81c2d reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett e5e0fe0d14 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 3b425f85cf Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 84e0446cb7 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett a0bf7e9762 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 487292cd61 more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett 0068bcda3d more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett 265d3350d7 Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett ea033954ef Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 07838507e0 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 5b87e51543 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 2b6c3005f7 install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett 6349ad725e install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett 44a2e2d2c6 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett c35cb622a6 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett d36ed8fe6e New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett c939cd0255 New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett 2533ee1222 get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett b22a420810 get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett 1309c95598 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett fe6b1e3b52 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett 7cff048b2e Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett 62f59f67ad Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett 15a3c9b45f Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett e60d1c851d Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett f168b002d5 clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Neale Pickett 43dc478605 clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Aaron McPhall 7ce86d2a87 Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Aaron McPhall dd175841e5 Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Neale Pickett d48ba70073 Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett e7f7007af8 Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 8bbc2d5593 add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett 816b7cd94d add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett e98304dbf3 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett c61d81a658 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 07090c9d0e some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett 1d1e62cf6a some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett d07546d5ab nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 2520cc6b46 nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 20c6cfe3d1 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 80bb33edd2 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 99a5ea1017 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett 9aa18abe20 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett e6c4a218df Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett 15a5fc93c7 Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett 02f21d3964 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett f08766c478 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett 1d6b8f6971 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett 92de8ca025 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett d785404d8d Start at cows and bulls game 2012-01-18 21:40:56 -07:00
Neale Pickett 71947a7ada Start at cows and bulls game 2012-01-18 21:40:56 -07:00
Neale Pickett 713027b737 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-11-05 17:42:28 -06:00
Neale Pickett b421580c69 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-11-05 17:42:28 -06:00
Neale Pickett f01680990c increase ipv6 neighbor threshholds 2011-11-05 17:40:14 -06:00
Neale Pickett 5f5a1fab8e increase ipv6 neighbor threshholds 2011-11-05 17:40:14 -06:00
Neale Pickett 81bc9dd686 put tanks back in 2011-11-05 14:27:56 -06:00
Neale Pickett ec1f15509c put tanks back in 2011-11-05 14:27:56 -06:00
Aaron J. McPhall ee27cf1151 Fixed flushing bug 2011-11-04 11:03:48 -06:00
Aaron J. McPhall 7484f5fc6a Fixed flushing bug 2011-11-04 11:03:48 -06:00
Aaron J. McPhall 5ee06f79cd Fixed condition in playfair where xx -> XX XX 2011-11-04 10:48:58 -06:00
Aaron J. McPhall d1e5ac265b Fixed condition in playfair where xx -> XX XX 2011-11-04 10:48:58 -06:00
Neale Pickett 728152af50 fix revwords build 2011-11-03 22:22:19 -06:00
Neale Pickett 347153fc42 fix revwords build 2011-11-03 22:22:19 -06:00
Neale Pickett 106635bc37 add playfair live category 2011-11-03 22:22:07 -06:00
Neale Pickett 4c5d67019e add playfair live category 2011-11-03 22:22:07 -06:00