Commit Graph

474 Commits

Author SHA1 Message Date
Neale Pickett 94963d52df p2client package 2012-06-09 14:42:46 -06:00
Neale Pickett ccb2165966 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
Aaron J. McPhall 6520f7dac6 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 2ba0d2ecec 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 743099a57b 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 bb923abc6b 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 e3cf808e79 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 0163c4e636 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 d4568c4143 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 b43c76c839 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 bbb17c787e 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 0225cc740c 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 2b791f63d1 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 29099b6496 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
Neale Pickett ba507c4925 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 McPhall 1a032f7d62 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
Aaron J. McPhall 2e4a53853c 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
Neale Pickett 664bbd0644 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
Aaron J. McPhall e09428cf16 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 2db590e8e4 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
Neale Pickett a2279e94ab 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 c4affbbd5f 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 06a8e6da8d 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
Aaron J. McPhall 780fc4f437 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 4a3df9a3a2 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 24df97d2f7 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 63887f7c53 debugged p2 console 2012-05-25 22:38:46 -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 91f765f598 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 376c1aaf7b 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
Neale Pickett c060311f11 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett 1c172ecd7d add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 8fdfce3eb8 add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 6183e24e95 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 5cbbdd0a5f add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 02456ac940 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett b6ec9faae3 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett d6793b7c41 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett c008649609 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett b6cf242700 Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 0656034e8b Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 5afb9f8fd4 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 3882487a11 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett cdc5f01f42 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett b42b916d89 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett c658e44334 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett e4b4de790f Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett a885277a68 fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett cfa705519d fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 765a533cc0 Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 3f47099713 Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 7b1300378c last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 80cf8843f3 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 50e9bd4622 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 392c8d5ad0 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 48ae43cfd5 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 0280eb9481 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett a12cf49a7d reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 52e55d8720 reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett b4b28e14d6 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 39e78e5549 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 92c5d13e19 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 7cc9998955 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 9dba669883 more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett d387b78739 more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett 7710f736a2 Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 3e856862b0 Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 812ab412d3 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett eaa3f602b2 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 03db14e2b0 install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett 26be89aadf install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett eed8e7ac30 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett a88ae62c40 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett 3f1f1fce1e New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett eb9786e45d New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett e4f4593a0c get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett f09591994d get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett f7e5a5c3b3 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett ac29393740 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett 000bd310a9 Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett a6bd35333a Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett 975c2cbe93 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett 915326d1e4 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett 9a24ee1080 clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Neale Pickett 411ebf34a5 clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Aaron McPhall 37f0bc67f2 Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Aaron McPhall 34956b58f7 Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Neale Pickett 27f64e288a Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 8d3845275e Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 83841a1843 add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett 243134bcaa add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett a62871d9e1 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 6ec47e8513 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 3b4b7a22b0 some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett 0217ffb5b1 some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett 65fd705cb6 nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 83e07a7b4b nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 4426980441 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett cc9668457d work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 4ffd4b732f Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett 7ec7feea09 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett 318aa637dd Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett 46295762e3 Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett c2fd1107c8 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett b475e5330a cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett 778e6b6641 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett dfd354b863 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett 8c3805fccc Start at cows and bulls game 2012-01-18 21:40:56 -07:00
Neale Pickett 49e8ccfdde Start at cows and bulls game 2012-01-18 21:40:56 -07:00
Neale Pickett 5af05577e2 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-11-05 17:42:28 -06:00
Neale Pickett aa4e315150 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-11-05 17:42:28 -06:00
Neale Pickett 200c3b3fa7 increase ipv6 neighbor threshholds 2011-11-05 17:40:14 -06:00
Neale Pickett 9e6f61c824 increase ipv6 neighbor threshholds 2011-11-05 17:40:14 -06:00
Neale Pickett f7c069cc72 put tanks back in 2011-11-05 14:27:56 -06:00
Neale Pickett e336eb559d put tanks back in 2011-11-05 14:27:56 -06:00
Aaron J. McPhall a45a0424fc Fixed flushing bug 2011-11-04 11:03:48 -06:00
Aaron J. McPhall 441eadf328 Fixed flushing bug 2011-11-04 11:03:48 -06:00
Aaron J. McPhall 5f71708a87 Fixed condition in playfair where xx -> XX XX 2011-11-04 10:48:58 -06:00
Aaron J. McPhall 698d78aed6 Fixed condition in playfair where xx -> XX XX 2011-11-04 10:48:58 -06:00
Neale Pickett 0aae332f6f fix revwords build 2011-11-03 22:22:19 -06:00
Neale Pickett 43e91dc7d5 fix revwords build 2011-11-03 22:22:19 -06:00
Neale Pickett 6668588501 add playfair live category 2011-11-03 22:22:07 -06:00
Neale Pickett bf655905d9 add playfair live category 2011-11-03 22:22:07 -06:00