Commit Graph

948 Commits

Author SHA1 Message Date
Neale Pickett 90e9142abf Document IPv6 layout 2011-09-23 09:11:20 -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 71a8f95f68 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett 61eee6c826 fix arc4 definition 2011-09-21 17:31:13 -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 aceb3fcc48 Merge branch 'inferno' 2011-09-14 13:30:22 -06:00
Neale Pickett 039ccb2cf5 Merge branch 'inferno' 2011-09-14 13:30:22 -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
Cherish A. Franco 9880ba1017 Fixing the date to register on the posters! ~Cherish 2011-09-06 10:01:13 -06:00
Cherish A. Franco 5b260a96a0 Fixing the date to register on the posters! ~Cherish 2011-09-06 10:01:13 -06:00
Neale Pickett 741506dd22 add poster generator for 2010 NMT event 2011-08-29 09:38:45 -06:00
Neale Pickett 69809e7c2f add poster generator for 2010 NMT event 2011-08-29 09:38:45 -06:00
Neale Pickett cd9c2a2f84 save the date cards 2011-08-22 17:01:41 -06:00
Neale Pickett 85287628d4 save the date cards 2011-08-22 17:01:41 -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 26f91d66d9 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-08-16 16:31:40 -06:00
Neale Pickett 169ed9d006 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-08-16 16:31:40 -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 105d7a3205 add list of interested parties for TF4 2011-08-12 13:01:54 -06:00
Neale Pickett 4f9645b098 add list of interested parties for TF4 2011-08-12 13:01:54 -06:00
Cherish A. Franco 8f6e37a928 Adding new posters for NM Collegiate Security Series: NMT CTF Invitiational November5-6 2011. ~Cherish 2011-08-11 17:20:20 -06:00
Cherish A. Franco b5df3a0448 Adding new posters for NM Collegiate Security Series: NMT CTF Invitiational November5-6 2011. ~Cherish 2011-08-11 17:20:20 -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 21399b21c3 update todo 2011-07-20 08:20:52 -06:00