Commit Graph

468 Commits

Author SHA1 Message Date
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
Neale Pickett dbcb895640 multi-point tokens in radio 2011-11-03 18:51:28 -06:00
Neale Pickett 7217d03259 multi-point tokens in radio 2011-11-03 18:51:28 -06:00
Neale Pickett 4ec9016e68 add Kate-o's radio 2011-11-03 18:50:42 -06:00
Neale Pickett 11d5a65097 add Kate-o's radio 2011-11-03 18:50:42 -06:00
Neale Pickett c2d84ec98b add revwords package 2011-11-01 18:56:04 -06:00
Neale Pickett 99c3ed20ab add revwords package 2011-11-01 18:56:04 -06:00
Neale Pickett 5e81709629 add router sanity check, fix mcp race condition 2011-10-19 16:16:57 -06:00
Neale Pickett ce9b172ecb add router sanity check, fix mcp race condition 2011-10-19 16:16:57 -06:00
Neale Pickett a5caa33cbd Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-10-17 07:31:51 -06:00
Neale Pickett 3d4b401396 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-10-17 07:31:51 -06:00
Neale Pickett 55d01310e7 printf working 2011-10-14 22:10:25 -06:00
Neale Pickett dc3474df0f printf working 2011-10-14 22:10:25 -06:00
Neale Pickett d6ca3625a6 add some stuff I forgot (it's late) 2011-10-13 22:14:35 -06:00
Neale Pickett e42da095d1 add some stuff I forgot (it's late) 2011-10-13 22:14:35 -06:00
Neale Pickett 9b22ae19c5 add fizzbuzz 2011-10-13 22:12:53 -06:00
Neale Pickett b87ec717c1 add fizzbuzz 2011-10-13 22:12:53 -06:00
Neale Pickett e9bb082a1f make octopus use a changeable token 2011-10-13 21:24:29 -06:00
Neale Pickett 29cd09bc70 make octopus use a changeable token 2011-10-13 21:24:29 -06:00
Neale Pickett 5e725489a1 add multicaster, verify token junk 2011-10-13 21:15:11 -06:00
Neale Pickett 7c7fcb2949 add multicaster, verify token junk 2011-10-13 21:15:11 -06:00
Neale Pickett 3df8fe2ff0 Verified claim.cgi, puzzled, scoreboard. Looking good. 2011-10-13 17:22:03 -06:00
Neale Pickett 46404a3667 Verified claim.cgi, puzzled, scoreboard. Looking good. 2011-10-13 17:22:03 -06:00
Neale Pickett f1fd8d55ff make points submission almost work again 2011-10-12 17:41:19 -06:00
Neale Pickett 02b9884709 make points submission almost work again 2011-10-12 17:41:19 -06:00
Neale Pickett 84805b94e3 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2011-10-12 10:50:53 -06:00
Neale Pickett ea79cc79e5 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2011-10-12 10:50:53 -06:00
Neale Pickett 08be17cdca replace mrd6 with ecmh 2011-10-12 10:50:09 -06:00
Neale Pickett 0a163cc53e replace mrd6 with ecmh 2011-10-12 10:50:09 -06:00
Neale Pickett 0273187de2 stop building lxc by default 2011-10-12 10:49:37 -06:00
Neale Pickett 6bd7d70c90 stop building lxc by default 2011-10-12 10:49:37 -06:00
Cherish A. Franco c8da0c6a40 Done with AWESOME server I think! ~Cherish 2011-10-11 17:14:19 -06:00
Cherish A. Franco 18d15842f3 Done with AWESOME server I think! ~Cherish 2011-10-11 17:14:19 -06:00
Cherish A. Franco eaafc59d40 Fixing those stupid exit(10); things. ~Cherish 2011-10-11 16:02:51 -06:00
Cherish A. Franco 0f1a8d66fe Fixing those stupid exit(10); things. ~Cherish 2011-10-11 16:02:51 -06:00
Cherish A. Franco 17f5644960 Working on that server again, Now it does more stuff, er, more address getting. ~Cherish 2011-10-11 15:54:52 -06:00
Cherish A. Franco 9e8968bbdd Working on that server again, Now it does more stuff, er, more address getting. ~Cherish 2011-10-11 15:54:52 -06:00
Neale Pickett 57796bb819 fizzbuzz puzzle 2011-10-10 22:28:56 -06:00
Neale Pickett 8567bd04ee fizzbuzz puzzle 2011-10-10 22:28:56 -06:00
Cherish A. Franco 7e8e61cb6c Making client do some snazzy stuff like sendto(). ~Cherish 2011-09-29 16:04:38 -06:00
Cherish A. Franco 5cffbd9632 Making client do some snazzy stuff like sendto(). ~Cherish 2011-09-29 16:04:38 -06:00
Neale Pickett f10f1aa880 Make multicast packets have >1 hops 2011-09-29 14:29:19 -06:00
Neale Pickett da4e850386 Make multicast packets have >1 hops 2011-09-29 14:29:19 -06:00
Neale Pickett 7bbb428f51 add multicaster 2011-09-29 09:32:27 -06:00
Neale Pickett 677c2d9a68 add multicaster 2011-09-29 09:32:27 -06:00
Neale Pickett 98ddbdad01 add mrd6 to router image 2011-09-28 15:47:49 -06:00
Neale Pickett 77647d7cc1 add mrd6 to router image 2011-09-28 15:47:49 -06:00
Neale Pickett 4e34e990d9 Make LXC binaries search the right place for libraries 2011-09-26 14:13:37 -06:00
Neale Pickett 814b906f72 Make LXC binaries search the right place for libraries 2011-09-26 14:13:37 -06:00
Neale Pickett 0f5ad7ad46 Merge branch 'lxc'
Conflicts:
	packages/lxc/lxc.mk
2011-09-26 13:03:43 -06:00
Neale Pickett 4d0e2bd07c Merge branch 'lxc'
Conflicts:
	packages/lxc/lxc.mk
2011-09-26 13:03:43 -06:00
Neale Pickett b3375e618e LXC compiling 2011-09-26 13:00:42 -06:00
Neale Pickett d3184bac3d LXC compiling 2011-09-26 13:00:42 -06:00
Neale Pickett b31afa0eb4 Reall move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 12:13:50 -06:00
Neale Pickett 1aafd2d702 Reall move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 12:13:50 -06:00
Neale Pickett db65cf5c70 Move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 11:52:28 -06:00
Neale Pickett c711235119 Move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 11:52:28 -06:00
Neale Pickett 56bdd6026d Attempt to bring in lxc 2011-09-26 11:51:04 -06:00
Neale Pickett ddaa53f30b Attempt to bring in lxc 2011-09-26 11:51:04 -06:00
Neale Pickett c7b49443ca cleanup, add lxc package (broken) 2011-09-23 17:05:14 -06:00
Neale Pickett 2d36222308 cleanup, add lxc package (broken) 2011-09-23 17:05:14 -06:00
Neale Pickett d967189d99 /service/* stays up 2011-09-23 16:57:26 -06:00
Neale Pickett afc5b479f2 /service/* stays up 2011-09-23 16:57:26 -06:00
Neale Pickett c4e6a49291 remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett 1d8de3651f remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett 0753b78b94 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 607034b2e3 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 1303ae6a5b resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 7a4c78e24e resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 95dd33d1b8 remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 4ce9f011c5 remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 70d4f4d27c IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett d1fcadc838 IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 61285070a8 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 35014c7642 Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett af6544ceaa Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett cd80261e5d Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 0f709df383 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett a82fbfe7ba octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett d5976d4a2e fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett cfb7728a46 fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett 24ea578807 Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 9231deff32 Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6ba995ae2b create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 774d90c7bd create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 9ee99a6334 modify a few things 2011-09-16 10:08:07 -06:00
Neale Pickett 66df6ee1eb modify a few things 2011-09-16 10:08:07 -06:00
Neale Pickett a0eb02c614 add sshd to inferno 2011-09-13 15:50:40 -06:00
Neale Pickett a3bdc1fe34 add sshd to inferno 2011-09-13 15:50:40 -06:00
Neale Pickett 2fb7175ca1 Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett e58666c1eb Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett 15c02d51c2 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett e3c2d59308 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett cabe55e486 Macintosh can't handle non-default routes 2011-08-16 16:23:18 -06:00
Neale Pickett b35641ad22 Macintosh can't handle non-default routes 2011-08-16 16:23:18 -06:00
Neale Pickett e871b3082c add fish forwarder 2011-07-29 20:19:13 -06:00
Neale Pickett 2203c30ba6 add fish forwarder 2011-07-29 20:19:13 -06:00
Neale Pickett e07f81113c Configure router package for 172.16.0.0/12 2011-07-28 18:07:55 -06:00
Neale Pickett b2cdbfadbe Configure router package for 172.16.0.0/12 2011-07-28 18:07:55 -06:00
Neale Pickett a29ccb9b28 Fixes at LLNL interns event 2011-07-20 08:36:02 -06:00
Neale Pickett 662ec4f30a Fixes at LLNL interns event 2011-07-20 08:36:02 -06:00
Neale Pickett 46f831d644 Get logger working with new token system 2011-03-25 16:22:17 -06:00
Neale Pickett f7de2f45b8 Get logger working with new token system 2011-03-25 16:22:17 -06:00
Neale Pickett d260a2d55a Move puzzles into their own repo 2011-03-25 16:20:23 -06:00
Neale Pickett cd16a73827 Move puzzles into their own repo 2011-03-25 16:20:23 -06:00
Neale Pickett afc015dcc8 Start at a portable puzzle format 2011-03-24 17:12:33 -06:00
Neale Pickett 50f6449a36 Start at a portable puzzle format 2011-03-24 17:12:33 -06:00