Commit Graph

896 Commits

Author SHA1 Message Date
Neale Pickett 5b3aac001b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 17d0544c1e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 9ceebc2a6e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 103688df85 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett c1512ce6a2 fix arc4 definition 2011-09-21 17:31:13 -06:00
Neale Pickett ae37e47966 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 13b1de268e 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 01a041c013 Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 4c84013c4c Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 64b2316860 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 7337fea1e1 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 5c870b3c6f fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett 2031016d46 fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett bdc64d547c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6a878e5c2c 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 709a0e3c90 modify a few things 2011-09-16 10:08:07 -06:00
Neale Pickett 700f871d0f modify a few things 2011-09-16 10:08:07 -06:00
Neale Pickett bfcaa88d24 Merge branch 'inferno' 2011-09-14 13:30:22 -06:00
Neale Pickett dc2b489441 Merge branch 'inferno' 2011-09-14 13:30:22 -06:00
Neale Pickett 1a9b8979de add sshd to inferno 2011-09-13 15:50:40 -06:00
Neale Pickett 0bfd9efdc2 add sshd to inferno 2011-09-13 15:50:40 -06:00
Cherish A. Franco 59dc31a55d Fixing the date to register on the posters! ~Cherish 2011-09-06 10:01:13 -06:00
Cherish A. Franco 199ea7ff3d Fixing the date to register on the posters! ~Cherish 2011-09-06 10:01:13 -06:00
Neale Pickett e3f97c5b12 add poster generator for 2010 NMT event 2011-08-29 09:38:45 -06:00
Neale Pickett 051356303d add poster generator for 2010 NMT event 2011-08-29 09:38:45 -06:00
Neale Pickett d7aacab7af save the date cards 2011-08-22 17:01:41 -06:00
Neale Pickett 008ef03d82 save the date cards 2011-08-22 17:01:41 -06:00
Neale Pickett 9389f79a2e Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett 8fb5a0eb6a Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett 7b7f6ce212 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett a3b28ca275 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett 385f4630d3 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-08-16 16:31:40 -06:00
Neale Pickett 54cc0b8553 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 9fb714eb85 add list of interested parties for TF4 2011-08-12 13:01:54 -06:00
Neale Pickett 77ed859437 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
Neale Pickett 329c03b55e update todo 2011-07-20 08:20:52 -06:00
Neale Pickett 46f831d644 Get logger working with new token system 2011-03-25 16:22:17 -06:00