From 637545aa9ac8369d38675e79933f9a185d654efd Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Thu, 21 Oct 2010 22:15:18 -0600 Subject: [PATCH] Make puzzles first class categories --- Makefile | 21 ++-------- {common => include}/arc4.c | 0 {common => include}/arc4.h | 0 {common => include}/isaac.c | 0 {common => include}/isaac.h | 0 {common => include}/token.c | 0 {common => include}/token.h | 0 logger/logger.mk | 21 ---------- logger/src/token.c | 1 - logger/src/token.h | 1 - mcp/mcp.mk | 33 --------------- mcp/src/arc4.c | 1 - mcp/src/arc4.h | 1 - puzzles/mkpuzzles => mkpuzzles | 0 octopus/octopus.mk | 20 --------- octopus/src/token.c | 1 - octopus/src/token.h | 1 - {puzzles => packages}/basemath/1/index.mdwn | 0 {puzzles => packages}/basemath/1/key | 0 {puzzles => packages}/basemath/2/index.mdwn | 0 {puzzles => packages}/basemath/2/key | 0 {puzzles => packages}/basemath/3/index.mdwn | 0 {puzzles => packages}/basemath/3/key | 0 {puzzles => packages}/basemath/4/index.mdwn | 0 {puzzles => packages}/basemath/4/key | 0 {puzzles => packages}/basemath/5/index.mdwn | 0 {puzzles => packages}/basemath/5/key | 0 packages/basemath/basemath.mk | 1 + {puzzles => packages}/basemath/summary.txt | 0 {puzzles => packages}/bletchley/100/key | 0 {puzzles => packages}/bletchley/100/key.png | Bin .../bletchley/1000/index.mdwn | 0 {puzzles => packages}/bletchley/1000/key | 0 .../150/aacaaebb0cd0503e7bad97c42321a738 | Bin .../bletchley/150/index.mdwn | 0 {puzzles => packages}/bletchley/150/key | 0 .../bletchley/200/index.mdwn | 0 {puzzles => packages}/bletchley/200/key | 0 .../bletchley/250/index.mdwn | 0 {puzzles => packages}/bletchley/250/key | 0 .../bletchley/300/index.mdwn | 0 {puzzles => packages}/bletchley/300/key | 0 .../350/936bc08007a9076673a81040024728be | Bin {puzzles => packages}/bletchley/350/key | 0 .../50/adddbafb502355634d9ef10e1848cf52 | Bin {puzzles => packages}/bletchley/50/key | 0 .../bletchley/500/200601262232.ogg | Bin .../bletchley/500/cipher.txt | 0 .../bletchley/500/index.mdwn | 0 {puzzles => packages}/bletchley/500/key | 0 .../900/1d45b460b5844d0d769ca469f7b5bdc7 | Bin {puzzles => packages}/bletchley/900/key | 0 packages/bletchley/bletchley.mk | 1 + {puzzles => packages}/bletchley/summary.txt | 0 .../codebreaking/1/index.mdwn | 0 {puzzles => packages}/codebreaking/1/key | 0 .../codebreaking/2/index.mdwn | 0 {puzzles => packages}/codebreaking/2/key | 0 .../codebreaking/3/dancing.png | Bin .../codebreaking/3/index.mdwn | 0 {puzzles => packages}/codebreaking/3/key | 0 .../codebreaking/4/index.mdwn | 0 {puzzles => packages}/codebreaking/4/key | 0 .../codebreaking/5/image.png | Bin {puzzles => packages}/codebreaking/5/key | 0 .../codebreaking/6/image.png | Bin {puzzles => packages}/codebreaking/6/key | 0 .../codebreaking/7/index.mdwn | 0 {puzzles => packages}/codebreaking/7/key | 0 .../codebreaking/8/index.mdwn | 0 {puzzles => packages}/codebreaking/8/key | 0 packages/codebreaking/codebreaking.mk | 1 + .../codebreaking/summary.txt | 0 {puzzles => packages}/compaq/100/index.mdwn | 0 {puzzles => packages}/compaq/100/key | 0 .../150/b2f3f6b43ecadc7ae0b5f0edde694c78 | Bin {puzzles => packages}/compaq/150/key | 0 .../200/a6bcc9cff02efe6ae870e422014ee8c2 | Bin {puzzles => packages}/compaq/200/key | 0 .../350/e76cb42be0c0f12f97b2071aba8b74f2 | Bin {puzzles => packages}/compaq/350/key | 0 .../400/d56b7cb684b7d5137cbf7980b4e4a68f | Bin {puzzles => packages}/compaq/400/key | 0 {puzzles => packages}/compaq/50/index.mdwn | 0 {puzzles => packages}/compaq/50/key | 0 .../500/02cb1e1d65a68b29ac851936c9bb4684 | Bin {puzzles => packages}/compaq/500/key | 0 .../600/daa36d50d4c807634dfd13a8239046de | Bin {puzzles => packages}/compaq/600/key | 0 packages/compaq/compaq.mk | 1 + {puzzles => packages}/compaq/summary.txt | 0 {puzzles => packages}/crypto/1/index.mdwn | 0 {puzzles => packages}/crypto/1/key | 0 {puzzles => packages}/crypto/100/index.mdwn | 0 {puzzles => packages}/crypto/100/key | 0 {puzzles => packages}/crypto/100caesar.py | 0 {puzzles => packages}/crypto/110/index.mdwn | 0 {puzzles => packages}/crypto/110/key | 0 .../crypto/110substitution.py | 0 {puzzles => packages}/crypto/120/index.mdwn | 0 {puzzles => packages}/crypto/120/key | 0 {puzzles => packages}/crypto/120binary.py | 0 {puzzles => packages}/crypto/130/index.mdwn | 0 {puzzles => packages}/crypto/130/key | 0 {puzzles => packages}/crypto/130manchester.py | 0 {puzzles => packages}/crypto/140/index.mdwn | 0 {puzzles => packages}/crypto/140/key | 0 {puzzles => packages}/crypto/140morris.py | 0 {puzzles => packages}/crypto/150/index.mdwn | 0 {puzzles => packages}/crypto/150/key | 0 {puzzles => packages}/crypto/150sbox.py | 0 {puzzles => packages}/crypto/160/index.mdwn | 0 {puzzles => packages}/crypto/160/key | 0 {puzzles => packages}/crypto/160xor.py | 0 {puzzles => packages}/crypto/170/index.mdwn | 0 {puzzles => packages}/crypto/170/key | 0 {puzzles => packages}/crypto/170transpose.py | 0 {puzzles => packages}/crypto/180/index.mdwn | 0 {puzzles => packages}/crypto/180/key | 0 {puzzles => packages}/crypto/180rotate.py | 0 {puzzles => packages}/crypto/190/index.mdwn | 0 {puzzles => packages}/crypto/190rotate.py | 0 {puzzles => packages}/crypto/200/key | 0 {puzzles => packages}/crypto/200cbc.py | 0 {puzzles => packages}/crypto/210/index.mdwn | 0 {puzzles => packages}/crypto/210/key | 0 {puzzles => packages}/crypto/210cbc.py | 0 {puzzles => packages}/crypto/220/index.mdwn | 0 {puzzles => packages}/crypto/220/key | 0 {puzzles => packages}/crypto/220cbc.py | 0 {puzzles => packages}/crypto/230/index.mdwn | 0 {puzzles => packages}/crypto/230/key | 0 {puzzles => packages}/crypto/230cbc.py | 0 {puzzles => packages}/crypto/240/index.mdwn | 0 {puzzles => packages}/crypto/240/key | 0 {puzzles => packages}/crypto/240diffie.py | 0 {puzzles => packages}/crypto/400/index.mdwn | 0 {puzzles => packages}/crypto/400/key | 0 {puzzles => packages}/crypto/400onetimepad.py | 0 {puzzles => packages}/crypto/cbc.py | 0 packages/crypto/crypto.mk | 1 + {puzzles => packages}/crypto/crypto.py | 0 {puzzles => packages}/crypto/diffie.py | 0 {puzzles => packages}/crypto/transform.py | 0 {puzzles => packages}/forensics/10/index.html | 0 {puzzles => packages}/forensics/10/key | 0 .../forensics/100/index.html | 0 {puzzles => packages}/forensics/100/key | 0 {puzzles => packages}/forensics/20/index.html | 0 {puzzles => packages}/forensics/20/key | 0 .../forensics/200/index.html | 0 {puzzles => packages}/forensics/200/key | 0 .../forensics/250/index.html | 0 {puzzles => packages}/forensics/250/key | 0 .../forensics/400/index.html | 0 {puzzles => packages}/forensics/400/key | 0 {puzzles => packages}/forensics/50/index.html | 0 {puzzles => packages}/forensics/50/key | 0 packages/forensics/forensics.mk | 1 + {puzzles => packages}/hackme/100/index.mdwn | 0 {puzzles => packages}/hackme/200/index.mdwn | 0 {puzzles => packages}/hackme/200/key | 0 {puzzles => packages}/hackme/274/index.mdwn | 0 {puzzles => packages}/hackme/300/index.mdwn | 0 {puzzles => packages}/hackme/614/index.mdwn | 0 {puzzles => packages}/hackme/614/key | 0 {puzzles => packages}/hackme/806/index.mdwn | 0 {puzzles => packages}/hackme/806/key | 0 packages/hackme/hackme.mk | 1 + {puzzles => packages}/hackme/summary.txt | 0 packages/logger/logger.mk | 20 +++++++++ .../logger}/service/logger/log/run | 0 .../logger}/service/logger/run | 0 {logger => packages/logger}/src/COPYING | 0 {logger => packages/logger}/src/Makefile | 0 {logger => packages/logger}/src/logger.c | 0 packages/logger/src/token.c | 1 + packages/logger/src/token.h | 1 + .../logger}/tokens/logger0/category | 0 .../logger}/tokens/logger0/category.key | 0 .../logger}/tokens/logger0/enc.key | 0 .../logger}/tokens/logger1/category | 0 .../logger}/tokens/logger1/category.key | 0 .../logger}/tokens/logger1/enc.key | 0 .../logger}/tokens/logger2/category | 0 .../logger}/tokens/logger2/category.key | 0 .../logger}/tokens/logger2/enc.key | 0 {mcp => packages/mcp}/Makefile | 0 {mcp => packages/mcp}/bin/addteam | 0 {mcp => packages/mcp}/bin/run-ctf | 0 {mcp => packages/mcp}/bin/scoreboard | 0 {mcp => packages/mcp}/bin/teams.sh | 0 packages/mcp/mcp.mk | 30 ++++++++++++++ {mcp => packages/mcp}/service/eth0/run | 0 {mcp => packages/mcp}/service/httpd/log/run | 0 .../mcp}/service/httpd/mathopd.conf | 0 {mcp => packages/mcp}/service/httpd/run | 0 {mcp => packages/mcp}/service/ircd/log/run | 0 .../mcp}/service/ircd/ngircd.conf | 0 {mcp => packages/mcp}/service/ircd/run | 0 {mcp => packages/mcp}/service/pointsd/log/run | 0 {mcp => packages/mcp}/service/pointsd/pointsd | 0 {mcp => packages/mcp}/service/pointsd/run | 0 {mcp => packages/mcp}/service/puzzled/log/run | 0 {mcp => packages/mcp}/service/puzzled/puzzled | 0 {mcp => packages/mcp}/service/puzzled/run | 0 {mcp => packages/mcp}/service/sshd/log/run | 0 {mcp => packages/mcp}/service/sshd/rsa.key | Bin {mcp => packages/mcp}/service/sshd/run | 0 {mcp => packages/mcp}/service/tokend/log/run | 0 {mcp => packages/mcp}/service/tokend/run | 0 {mcp => packages/mcp}/src/Makefile | 0 packages/mcp/src/arc4.c | 1 + packages/mcp/src/arc4.h | 1 + {mcp => packages/mcp}/src/claim.cgi.c | 0 {mcp => packages/mcp}/src/common.c | 0 {mcp => packages/mcp}/src/common.h | 0 {mcp => packages/mcp}/src/in.tokend.c | 0 {mcp => packages/mcp}/src/pointscli.c | 0 {mcp => packages/mcp}/src/puzzler.cgi.c | 0 {mcp => packages/mcp}/src/puzzles.cgi.c | 0 {mcp => packages/mcp}/src/src.mk | 0 {mcp => packages/mcp}/src/tokencli.c | 0 {mcp => packages/mcp}/test.sh | 0 {mcp => packages/mcp}/tokend.keys/logger | 0 {mcp => packages/mcp}/tokend.keys/octopus | 0 {mcp => packages/mcp}/tokend.keys/printf | 0 {mcp => packages/mcp}/tokend.keys/pwnables | 0 {mcp => packages/mcp}/www/ctf.css | 0 {mcp => packages/mcp}/www/grunge.png | Bin {mcp => packages/mcp}/www/index.html | 0 {mcp => packages/mcp}/www/register.html | 0 {mcp => packages/mcp}/www/scoreboard.js | 0 {mcp => packages/mcp}/www/scoring.html | 0 {puzzles => packages}/net-re/.gitignore | 0 {puzzles => packages}/net-re/1/index.mdwn | 0 {puzzles => packages}/net-re/1/key | 0 {puzzles => packages}/net-re/10/index.mdwn | 0 {puzzles => packages}/net-re/10/key | 0 {puzzles => packages}/net-re/10/session.pcap | Bin {puzzles => packages}/net-re/100/index.mdwn | 0 {puzzles => packages}/net-re/100/key | 0 {puzzles => packages}/net-re/1000/index.mdwn | 0 {puzzles => packages}/net-re/1000/key | 0 .../1200/14b44ef250afd460b42d0947846b306e | 0 {puzzles => packages}/net-re/1200/hint | 0 {puzzles => packages}/net-re/1200/key | 0 {puzzles => packages}/net-re/2/index.mdwn | 0 {puzzles => packages}/net-re/2/key | 0 {puzzles => packages}/net-re/20/index.mdwn | 0 {puzzles => packages}/net-re/20/key | 0 {puzzles => packages}/net-re/20/session.pcap | Bin {puzzles => packages}/net-re/200/index.mdwn | 0 {puzzles => packages}/net-re/200/key | 0 {puzzles => packages}/net-re/2000/3k.pcap | Bin {puzzles => packages}/net-re/2000/index.mdwn | 0 {puzzles => packages}/net-re/2000/key | 0 .../net-re/250/example.com-1.pcap | Bin {puzzles => packages}/net-re/250/hint | 0 {puzzles => packages}/net-re/250/index.mdwn | 0 {puzzles => packages}/net-re/250/key | 0 .../25000/b143bbda4bbce4e81ac720a6bbc0d7c6 | Bin {puzzles => packages}/net-re/25000/hint | 0 {puzzles => packages}/net-re/25000/key | 0 {puzzles => packages}/net-re/3/index.mdwn | 0 {puzzles => packages}/net-re/3/key | 0 {puzzles => packages}/net-re/30/index.mdwn | 0 {puzzles => packages}/net-re/30/key | 0 {puzzles => packages}/net-re/30/session.pcap | Bin {puzzles => packages}/net-re/300/index.mdwn | 0 {puzzles => packages}/net-re/300/key | 0 {puzzles => packages}/net-re/300/session.pcap | Bin .../3000/12a18338d10d3a764f8d95e40b244cd2 | Bin {puzzles => packages}/net-re/3000/key | 0 {puzzles => packages}/net-re/4/index.mdwn | 0 {puzzles => packages}/net-re/4/key | 0 {puzzles => packages}/net-re/400/index.mdwn | 0 {puzzles => packages}/net-re/400/key | 0 {puzzles => packages}/net-re/400/session.pcap | Bin .../4000/e464f161483b4a2fd8b690a98932b703 | Bin {puzzles => packages}/net-re/4000/key | 0 {puzzles => packages}/net-re/5/example1.pcap | Bin {puzzles => packages}/net-re/5/index.mdwn | 0 {puzzles => packages}/net-re/5/key | 0 {puzzles => packages}/net-re/5/key.pcap | Bin {puzzles => packages}/net-re/5/ws-examine.png | Bin {puzzles => packages}/net-re/5/ws-follow.png | Bin {puzzles => packages}/net-re/5/ws-opened.png | Bin {puzzles => packages}/net-re/5/ws-start.png | Bin {puzzles => packages}/net-re/5/ws-stream.png | Bin .../5000/53127bca7fed4875920675c2c9e14597 | Bin {puzzles => packages}/net-re/5000/key | 0 {puzzles => packages}/net-re/6/index.mdwn | 0 {puzzles => packages}/net-re/6/key | 0 {puzzles => packages}/net-re/7/index.mdwn | 0 {puzzles => packages}/net-re/7/key | 0 {puzzles => packages}/net-re/700/index.mdwn | 0 {puzzles => packages}/net-re/700/key | 0 {puzzles => packages}/net-re/8/index.mdwn | 0 {puzzles => packages}/net-re/8/key | 0 {puzzles => packages}/net-re/800/index.mdwn | 0 {puzzles => packages}/net-re/800/key | 0 packages/net-re/net-re.mk | 1 + {puzzles => packages}/net-re/summary.txt | 0 packages/octopus/octopus.mk | 19 +++++++++ .../octopus}/service/octopus/log/run | 0 .../octopus}/service/octopus/run | 0 {octopus => packages/octopus}/solution.sh | 0 {octopus => packages/octopus}/src/Makefile | 0 {octopus => packages/octopus}/src/octopus.c | 0 packages/octopus/src/token.c | 1 + packages/octopus/src/token.h | 1 + .../octopus}/tokens/octopus/category | 0 .../octopus}/tokens/octopus/category.key | 0 .../octopus}/tokens/octopus/enc.key | 0 packages/packages.mk | 38 ++++++++++++++++++ packages/printf/printf.mk | 20 +++++++++ .../printf}/service/printf/log/run | 0 .../printf}/service/printf/run | 0 .../printf}/service/printf/run-printf | 0 {printf => packages/printf}/src/Makefile | 0 {printf => packages/printf}/src/printf.c | 0 packages/printf/src/token.c | 1 + packages/printf/src/token.h | 1 + .../printf}/tokens/printf0/category | 0 .../printf}/tokens/printf0/category.key | 0 .../printf}/tokens/printf0/enc.key | 0 .../printf}/tokens/printf1/category | 0 .../printf}/tokens/printf1/category.key | 0 .../printf}/tokens/printf1/enc.key | 0 .../printf}/tokens/printf2/category | 0 .../printf}/tokens/printf2/category.key | 0 .../printf}/tokens/printf2/enc.key | 0 .../printf}/tokens/printf3/category | 0 .../printf}/tokens/printf3/category.key | 0 .../printf}/tokens/printf3/enc.key | 0 .../printf}/tokens/printf4/category | 0 .../printf}/tokens/printf4/category.key | 0 .../printf}/tokens/printf4/enc.key | 0 packages/pwnables/pwnables.mk | 20 +++++++++ .../pwnables}/service/eth0.pwn/run | 0 .../pwnables}/service/pwnables/log/run | 0 .../pwnables}/service/pwnables/motd | 0 .../pwnables}/service/pwnables/pwnie | 0 .../pwnables}/service/pwnables/run | 0 {pwnables => packages/pwnables}/src/Makefile | 0 {pwnables => packages/pwnables}/src/arc4.c | 0 {pwnables => packages/pwnables}/src/gimmie.c | 0 {pwnables => packages/pwnables}/src/killme.c | 0 .../pwnables}/src/ltraceme.c | 0 .../pwnables}/src/straceme.c | 0 packages/pwnables/src/token.c | 1 + packages/pwnables/src/token.h | 1 + .../pwnables}/tokens/gimmie/category | 0 .../pwnables}/tokens/gimmie/category.key | 0 .../pwnables}/tokens/gimmie/enc.key | 0 .../pwnables}/tokens/killme/category | 0 .../pwnables}/tokens/killme/category.key | 0 .../pwnables}/tokens/killme/enc.key | 0 .../pwnables}/tokens/ltraceme/category | 0 .../pwnables}/tokens/ltraceme/category.key | 0 .../pwnables}/tokens/ltraceme/enc.key | Bin .../pwnables}/tokens/straceme/category | 0 .../pwnables}/tokens/straceme/category.key | 0 .../pwnables}/tokens/straceme/enc.key | Bin {puzzles => packages}/sequence/1/index.mdwn | 0 {puzzles => packages}/sequence/1/key | 0 {puzzles => packages}/sequence/100/index.mdwn | 0 {puzzles => packages}/sequence/100/key | 0 {puzzles => packages}/sequence/16/index.mdwn | 0 {puzzles => packages}/sequence/16/key | 0 {puzzles => packages}/sequence/19/index.mdwn | 0 {puzzles => packages}/sequence/19/key | 0 {puzzles => packages}/sequence/2/index.mdwn | 0 {puzzles => packages}/sequence/2/key | 0 {puzzles => packages}/sequence/200/index.mdwn | 0 {puzzles => packages}/sequence/200/key | 0 {puzzles => packages}/sequence/25/index.mdwn | 0 {puzzles => packages}/sequence/25/key | 0 {puzzles => packages}/sequence/300/index.mdwn | 0 {puzzles => packages}/sequence/300/key | 0 {puzzles => packages}/sequence/35/index.mdwn | 0 {puzzles => packages}/sequence/35/key | 0 {puzzles => packages}/sequence/400/index.mdwn | 0 {puzzles => packages}/sequence/400/key | 0 {puzzles => packages}/sequence/450/index.mdwn | 0 {puzzles => packages}/sequence/450/key | 0 {puzzles => packages}/sequence/50/index.mdwn | 0 {puzzles => packages}/sequence/50/key | 0 {puzzles => packages}/sequence/600/index.mdwn | 0 {puzzles => packages}/sequence/600/key | 0 {puzzles => packages}/sequence/700/index.mdwn | 0 {puzzles => packages}/sequence/700/key | 0 {puzzles => packages}/sequence/8/index.mdwn | 0 {puzzles => packages}/sequence/8/key | 0 packages/sequence/sequence.mk | 1 + {puzzles => packages}/sequence/summary.txt | 0 {puzzles => packages}/skynet/100/index.mdwn | 0 {puzzles => packages}/skynet/100/key | 0 {puzzles => packages}/skynet/100/malware.zip | Bin {puzzles => packages}/skynet/102/index.mdwn | 0 {puzzles => packages}/skynet/102/key | 0 {puzzles => packages}/skynet/102/malware.zip | Bin {puzzles => packages}/skynet/200/index.mdwn | 0 {puzzles => packages}/skynet/200/key | 0 {puzzles => packages}/skynet/200/malware.zip | Bin {puzzles => packages}/skynet/202/index.mdwn | 0 {puzzles => packages}/skynet/202/key | 0 {puzzles => packages}/skynet/202/malware.zip | Bin {puzzles => packages}/skynet/203/index.mdwn | 0 {puzzles => packages}/skynet/203/key | 0 {puzzles => packages}/skynet/203/malware.zip | Bin {puzzles => packages}/skynet/300/index.mdwn | 0 {puzzles => packages}/skynet/300/key | 0 {puzzles => packages}/skynet/300/malware.zip | Bin {puzzles => packages}/skynet/301/index.mdwn | 0 {puzzles => packages}/skynet/301/key | 0 {puzzles => packages}/skynet/301/malware.zip | Bin {puzzles => packages}/skynet/302/index.mdwn | 0 {puzzles => packages}/skynet/302/key | 0 {puzzles => packages}/skynet/302/malware.zip | Bin {puzzles => packages}/skynet/400/index.mdwn | 0 {puzzles => packages}/skynet/400/key | 0 {puzzles => packages}/skynet/400/malware.zip | Bin {puzzles => packages}/skynet/401/index.mdwn | 0 {puzzles => packages}/skynet/401/key | 0 {puzzles => packages}/skynet/401/malware.zip | Bin {puzzles => packages}/skynet/500/index.mdwn | 0 {puzzles => packages}/skynet/500/key | 0 .../skynet/500/laststage-unpacker.exe | Bin {puzzles => packages}/skynet/500/malware.zip | Bin {puzzles => packages}/skynet/501/index.mdwn | 0 {puzzles => packages}/skynet/501/key | 0 .../skynet/501/laststage-unpacker.exe | Bin {puzzles => packages}/skynet/501/malware.zip | Bin packages/skynet/skynet.mk | 1 + {puzzles => packages}/skynet/summary.txt | 0 {puzzles => packages}/steg/1/,index.gif | Bin {puzzles => packages}/steg/1/index.mdwn | 0 {puzzles => packages}/steg/1/key | 0 {puzzles => packages}/steg/10/Makefile | 0 {puzzles => packages}/steg/10/key | 0 {puzzles => packages}/steg/10/src.jpg | Bin {puzzles => packages}/steg/10/text.txt | 0 {puzzles => packages}/steg/100/Makefile | 0 {puzzles => packages}/steg/100/encode | 0 {puzzles => packages}/steg/100/image.cmds | 0 {puzzles => packages}/steg/100/image.exv | Bin {puzzles => packages}/steg/100/key | 0 .../steg/100/pristine/ww0207-43.jpg | Bin .../steg/100/pristine/ww0207-45.jpg | Bin .../steg/100/pristine/ww0207-90.jpg | Bin .../steg/100/pristine/ww0870-09.jpg | Bin .../steg/100/pristine/ww0870-11.jpg | Bin .../steg/100/pristine/ww0870-14.jpg | Bin .../steg/100/pristine/ww1645-22.jpg | Bin .../steg/100/pristine/ww1645-43.jpg | Bin .../steg/100/pristine/ww1645-44.jpg | Bin .../steg/100/pristine/ww1645-52.jpg | Bin .../steg/100/pristine/ww1645-53.jpg | Bin .../steg/100/pristine/ww1645-55.jpg | Bin .../steg/100/pristine/ww1646-66.jpg | Bin .../steg/100/pristine/ww1646-67.jpg | Bin .../steg/100/pristine/ww1646-69.jpg | Bin .../steg/100/pristine/ww1646-70.jpg | Bin .../steg/100/pristine/ww1646-78.jpg | Bin .../steg/100/pristine/ww1647-37.jpg | Bin .../steg/100/pristine/ww1647-75.jpg | Bin .../steg/100/pristine/ww1647-85.jpg | Bin {puzzles => packages}/steg/15/Makefile | 0 {puzzles => packages}/steg/15/key | 0 {puzzles => packages}/steg/15/src.jpg | Bin {puzzles => packages}/steg/15/text.txt | 0 {puzzles => packages}/steg/2/key | 0 {puzzles => packages}/steg/2/test.docx | Bin {puzzles => packages}/steg/20/Makefile | 0 {puzzles => packages}/steg/20/key | 0 {puzzles => packages}/steg/20/src.jpg | Bin {puzzles => packages}/steg/20/text.txt | 0 {puzzles => packages}/steg/200/Makefile | 0 {puzzles => packages}/steg/200/encode | 0 {puzzles => packages}/steg/200/key | 0 {puzzles => packages}/steg/200/text.txt | 0 {puzzles => packages}/steg/3/key | 0 {puzzles => packages}/steg/3/test2.docx | Bin {puzzles => packages}/steg/30/Makefile | 0 {puzzles => packages}/steg/30/key | 0 {puzzles => packages}/steg/30/src.mp3 | Bin {puzzles => packages}/steg/30/text.txt | 0 {puzzles => packages}/steg/40/Makefile | 0 {puzzles => packages}/steg/40/encode | 0 {puzzles => packages}/steg/40/key | 0 {puzzles => packages}/steg/40/lena.png | Bin {puzzles => packages}/steg/40/text.txt | 0 packages/steg/steg.mk | 1 + {puzzles => packages}/steg/summary.txt | 0 .../tokens}/service/tokens/log/run | 0 .../tokens}/service/tokens/run | 0 .../tokens}/service/tokens/tokens | 0 {tokens => packages/tokens}/setup | 0 {tokens => packages/tokens}/src/Makefile | 0 {tokens => packages/tokens}/src/arc4-main.c | 0 packages/tokens/src/arc4.c | 1 + packages/tokens/src/arc4.h | 1 + {tokens => packages/tokens}/src/tokencli.c | 0 packages/tokens/tokens.mk | 20 +++++++++ {puzzles => packages}/webapp/10/,binary.png | Bin {puzzles => packages}/webapp/10/,ctf.css | 0 {puzzles => packages}/webapp/10/1.cgi | 0 {puzzles => packages}/webapp/10/key | 0 {puzzles => packages}/webapp/20/,binary.png | 0 {puzzles => packages}/webapp/20/,ctf.css | 0 {puzzles => packages}/webapp/20/2.cgi | 0 {puzzles => packages}/webapp/20/key | 0 {puzzles => packages}/webapp/30/,binary.png | 0 {puzzles => packages}/webapp/30/,ctf.css | 0 {puzzles => packages}/webapp/30/3.cgi | 0 {puzzles => packages}/webapp/30/key | 0 {puzzles => packages}/webapp/summary.txt | 0 packages/webapp/webapp.mk | 1 + printf/printf.mk | 21 ---------- printf/src/token.c | 1 - printf/src/token.h | 1 - puzzles/puzzles.mk | 24 ----------- pwnables/pwnables.mk | 21 ---------- pwnables/src/token.c | 1 - pwnables/src/token.h | 1 - tokens/src/arc4.c | 1 - tokens/src/arc4.h | 1 - tokens/tokens.mk | 21 ---------- 530 files changed, 194 insertions(+), 191 deletions(-) rename {common => include}/arc4.c (100%) rename {common => include}/arc4.h (100%) rename {common => include}/isaac.c (100%) rename {common => include}/isaac.h (100%) rename {common => include}/token.c (100%) rename {common => include}/token.h (100%) delete mode 100644 logger/logger.mk delete mode 120000 logger/src/token.c delete mode 120000 logger/src/token.h delete mode 100644 mcp/mcp.mk delete mode 120000 mcp/src/arc4.c delete mode 120000 mcp/src/arc4.h rename puzzles/mkpuzzles => mkpuzzles (100%) delete mode 100644 octopus/octopus.mk delete mode 120000 octopus/src/token.c delete mode 120000 octopus/src/token.h rename {puzzles => packages}/basemath/1/index.mdwn (100%) rename {puzzles => packages}/basemath/1/key (100%) rename {puzzles => packages}/basemath/2/index.mdwn (100%) rename {puzzles => packages}/basemath/2/key (100%) rename {puzzles => packages}/basemath/3/index.mdwn (100%) rename {puzzles => packages}/basemath/3/key (100%) rename {puzzles => packages}/basemath/4/index.mdwn (100%) rename {puzzles => packages}/basemath/4/key (100%) rename {puzzles => packages}/basemath/5/index.mdwn (100%) rename {puzzles => packages}/basemath/5/key (100%) create mode 100644 packages/basemath/basemath.mk rename {puzzles => packages}/basemath/summary.txt (100%) rename {puzzles => packages}/bletchley/100/key (100%) rename {puzzles => packages}/bletchley/100/key.png (100%) rename {puzzles => packages}/bletchley/1000/index.mdwn (100%) rename {puzzles => packages}/bletchley/1000/key (100%) rename {puzzles => packages}/bletchley/150/aacaaebb0cd0503e7bad97c42321a738 (100%) rename {puzzles => packages}/bletchley/150/index.mdwn (100%) rename {puzzles => packages}/bletchley/150/key (100%) rename {puzzles => packages}/bletchley/200/index.mdwn (100%) rename {puzzles => packages}/bletchley/200/key (100%) rename {puzzles => packages}/bletchley/250/index.mdwn (100%) rename {puzzles => packages}/bletchley/250/key (100%) rename {puzzles => packages}/bletchley/300/index.mdwn (100%) rename {puzzles => packages}/bletchley/300/key (100%) rename {puzzles => packages}/bletchley/350/936bc08007a9076673a81040024728be (100%) rename {puzzles => packages}/bletchley/350/key (100%) rename {puzzles => packages}/bletchley/50/adddbafb502355634d9ef10e1848cf52 (100%) rename {puzzles => packages}/bletchley/50/key (100%) rename {puzzles => packages}/bletchley/500/200601262232.ogg (100%) rename {puzzles => packages}/bletchley/500/cipher.txt (100%) rename {puzzles => packages}/bletchley/500/index.mdwn (100%) rename {puzzles => packages}/bletchley/500/key (100%) rename {puzzles => packages}/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7 (100%) rename {puzzles => packages}/bletchley/900/key (100%) create mode 100644 packages/bletchley/bletchley.mk rename {puzzles => packages}/bletchley/summary.txt (100%) rename {puzzles => packages}/codebreaking/1/index.mdwn (100%) rename {puzzles => packages}/codebreaking/1/key (100%) rename {puzzles => packages}/codebreaking/2/index.mdwn (100%) rename {puzzles => packages}/codebreaking/2/key (100%) rename {puzzles => packages}/codebreaking/3/dancing.png (100%) rename {puzzles => packages}/codebreaking/3/index.mdwn (100%) rename {puzzles => packages}/codebreaking/3/key (100%) rename {puzzles => packages}/codebreaking/4/index.mdwn (100%) rename {puzzles => packages}/codebreaking/4/key (100%) rename {puzzles => packages}/codebreaking/5/image.png (100%) rename {puzzles => packages}/codebreaking/5/key (100%) rename {puzzles => packages}/codebreaking/6/image.png (100%) rename {puzzles => packages}/codebreaking/6/key (100%) rename {puzzles => packages}/codebreaking/7/index.mdwn (100%) rename {puzzles => packages}/codebreaking/7/key (100%) rename {puzzles => packages}/codebreaking/8/index.mdwn (100%) rename {puzzles => packages}/codebreaking/8/key (100%) create mode 100644 packages/codebreaking/codebreaking.mk rename {puzzles => packages}/codebreaking/summary.txt (100%) rename {puzzles => packages}/compaq/100/index.mdwn (100%) rename {puzzles => packages}/compaq/100/key (100%) rename {puzzles => packages}/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78 (100%) rename {puzzles => packages}/compaq/150/key (100%) rename {puzzles => packages}/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2 (100%) rename {puzzles => packages}/compaq/200/key (100%) rename {puzzles => packages}/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2 (100%) rename {puzzles => packages}/compaq/350/key (100%) rename {puzzles => packages}/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f (100%) rename {puzzles => packages}/compaq/400/key (100%) rename {puzzles => packages}/compaq/50/index.mdwn (100%) rename {puzzles => packages}/compaq/50/key (100%) rename {puzzles => packages}/compaq/500/02cb1e1d65a68b29ac851936c9bb4684 (100%) rename {puzzles => packages}/compaq/500/key (100%) rename {puzzles => packages}/compaq/600/daa36d50d4c807634dfd13a8239046de (100%) rename {puzzles => packages}/compaq/600/key (100%) create mode 100644 packages/compaq/compaq.mk rename {puzzles => packages}/compaq/summary.txt (100%) rename {puzzles => packages}/crypto/1/index.mdwn (100%) rename {puzzles => packages}/crypto/1/key (100%) rename {puzzles => packages}/crypto/100/index.mdwn (100%) rename {puzzles => packages}/crypto/100/key (100%) rename {puzzles => packages}/crypto/100caesar.py (100%) rename {puzzles => packages}/crypto/110/index.mdwn (100%) rename {puzzles => packages}/crypto/110/key (100%) rename {puzzles => packages}/crypto/110substitution.py (100%) rename {puzzles => packages}/crypto/120/index.mdwn (100%) rename {puzzles => packages}/crypto/120/key (100%) rename {puzzles => packages}/crypto/120binary.py (100%) rename {puzzles => packages}/crypto/130/index.mdwn (100%) rename {puzzles => packages}/crypto/130/key (100%) rename {puzzles => packages}/crypto/130manchester.py (100%) rename {puzzles => packages}/crypto/140/index.mdwn (100%) rename {puzzles => packages}/crypto/140/key (100%) rename {puzzles => packages}/crypto/140morris.py (100%) rename {puzzles => packages}/crypto/150/index.mdwn (100%) rename {puzzles => packages}/crypto/150/key (100%) rename {puzzles => packages}/crypto/150sbox.py (100%) rename {puzzles => packages}/crypto/160/index.mdwn (100%) rename {puzzles => packages}/crypto/160/key (100%) rename {puzzles => packages}/crypto/160xor.py (100%) rename {puzzles => packages}/crypto/170/index.mdwn (100%) rename {puzzles => packages}/crypto/170/key (100%) rename {puzzles => packages}/crypto/170transpose.py (100%) rename {puzzles => packages}/crypto/180/index.mdwn (100%) rename {puzzles => packages}/crypto/180/key (100%) rename {puzzles => packages}/crypto/180rotate.py (100%) rename {puzzles => packages}/crypto/190/index.mdwn (100%) rename {puzzles => packages}/crypto/190rotate.py (100%) rename {puzzles => packages}/crypto/200/key (100%) rename {puzzles => packages}/crypto/200cbc.py (100%) rename {puzzles => packages}/crypto/210/index.mdwn (100%) rename {puzzles => packages}/crypto/210/key (100%) rename {puzzles => packages}/crypto/210cbc.py (100%) rename {puzzles => packages}/crypto/220/index.mdwn (100%) rename {puzzles => packages}/crypto/220/key (100%) rename {puzzles => packages}/crypto/220cbc.py (100%) rename {puzzles => packages}/crypto/230/index.mdwn (100%) rename {puzzles => packages}/crypto/230/key (100%) rename {puzzles => packages}/crypto/230cbc.py (100%) rename {puzzles => packages}/crypto/240/index.mdwn (100%) rename {puzzles => packages}/crypto/240/key (100%) rename {puzzles => packages}/crypto/240diffie.py (100%) rename {puzzles => packages}/crypto/400/index.mdwn (100%) rename {puzzles => packages}/crypto/400/key (100%) rename {puzzles => packages}/crypto/400onetimepad.py (100%) rename {puzzles => packages}/crypto/cbc.py (100%) create mode 100644 packages/crypto/crypto.mk rename {puzzles => packages}/crypto/crypto.py (100%) rename {puzzles => packages}/crypto/diffie.py (100%) rename {puzzles => packages}/crypto/transform.py (100%) rename {puzzles => packages}/forensics/10/index.html (100%) rename {puzzles => packages}/forensics/10/key (100%) rename {puzzles => packages}/forensics/100/index.html (100%) rename {puzzles => packages}/forensics/100/key (100%) rename {puzzles => packages}/forensics/20/index.html (100%) rename {puzzles => packages}/forensics/20/key (100%) rename {puzzles => packages}/forensics/200/index.html (100%) rename {puzzles => packages}/forensics/200/key (100%) rename {puzzles => packages}/forensics/250/index.html (100%) rename {puzzles => packages}/forensics/250/key (100%) rename {puzzles => packages}/forensics/400/index.html (100%) rename {puzzles => packages}/forensics/400/key (100%) rename {puzzles => packages}/forensics/50/index.html (100%) rename {puzzles => packages}/forensics/50/key (100%) create mode 100644 packages/forensics/forensics.mk rename {puzzles => packages}/hackme/100/index.mdwn (100%) rename {puzzles => packages}/hackme/200/index.mdwn (100%) rename {puzzles => packages}/hackme/200/key (100%) rename {puzzles => packages}/hackme/274/index.mdwn (100%) rename {puzzles => packages}/hackme/300/index.mdwn (100%) rename {puzzles => packages}/hackme/614/index.mdwn (100%) rename {puzzles => packages}/hackme/614/key (100%) rename {puzzles => packages}/hackme/806/index.mdwn (100%) rename {puzzles => packages}/hackme/806/key (100%) create mode 100644 packages/hackme/hackme.mk rename {puzzles => packages}/hackme/summary.txt (100%) create mode 100644 packages/logger/logger.mk rename {logger => packages/logger}/service/logger/log/run (100%) rename {logger => packages/logger}/service/logger/run (100%) rename {logger => packages/logger}/src/COPYING (100%) rename {logger => packages/logger}/src/Makefile (100%) rename {logger => packages/logger}/src/logger.c (100%) create mode 120000 packages/logger/src/token.c create mode 120000 packages/logger/src/token.h rename {logger => packages/logger}/tokens/logger0/category (100%) rename {logger => packages/logger}/tokens/logger0/category.key (100%) rename {logger => packages/logger}/tokens/logger0/enc.key (100%) rename {logger => packages/logger}/tokens/logger1/category (100%) rename {logger => packages/logger}/tokens/logger1/category.key (100%) rename {logger => packages/logger}/tokens/logger1/enc.key (100%) rename {logger => packages/logger}/tokens/logger2/category (100%) rename {logger => packages/logger}/tokens/logger2/category.key (100%) rename {logger => packages/logger}/tokens/logger2/enc.key (100%) rename {mcp => packages/mcp}/Makefile (100%) rename {mcp => packages/mcp}/bin/addteam (100%) rename {mcp => packages/mcp}/bin/run-ctf (100%) rename {mcp => packages/mcp}/bin/scoreboard (100%) rename {mcp => packages/mcp}/bin/teams.sh (100%) create mode 100644 packages/mcp/mcp.mk rename {mcp => packages/mcp}/service/eth0/run (100%) rename {mcp => packages/mcp}/service/httpd/log/run (100%) rename {mcp => packages/mcp}/service/httpd/mathopd.conf (100%) rename {mcp => packages/mcp}/service/httpd/run (100%) rename {mcp => packages/mcp}/service/ircd/log/run (100%) rename {mcp => packages/mcp}/service/ircd/ngircd.conf (100%) rename {mcp => packages/mcp}/service/ircd/run (100%) rename {mcp => packages/mcp}/service/pointsd/log/run (100%) rename {mcp => packages/mcp}/service/pointsd/pointsd (100%) rename {mcp => packages/mcp}/service/pointsd/run (100%) rename {mcp => packages/mcp}/service/puzzled/log/run (100%) rename {mcp => packages/mcp}/service/puzzled/puzzled (100%) rename {mcp => packages/mcp}/service/puzzled/run (100%) rename {mcp => packages/mcp}/service/sshd/log/run (100%) rename {mcp => packages/mcp}/service/sshd/rsa.key (100%) rename {mcp => packages/mcp}/service/sshd/run (100%) rename {mcp => packages/mcp}/service/tokend/log/run (100%) rename {mcp => packages/mcp}/service/tokend/run (100%) rename {mcp => packages/mcp}/src/Makefile (100%) create mode 120000 packages/mcp/src/arc4.c create mode 120000 packages/mcp/src/arc4.h rename {mcp => packages/mcp}/src/claim.cgi.c (100%) rename {mcp => packages/mcp}/src/common.c (100%) rename {mcp => packages/mcp}/src/common.h (100%) rename {mcp => packages/mcp}/src/in.tokend.c (100%) rename {mcp => packages/mcp}/src/pointscli.c (100%) rename {mcp => packages/mcp}/src/puzzler.cgi.c (100%) rename {mcp => packages/mcp}/src/puzzles.cgi.c (100%) rename {mcp => packages/mcp}/src/src.mk (100%) rename {mcp => packages/mcp}/src/tokencli.c (100%) rename {mcp => packages/mcp}/test.sh (100%) rename {mcp => packages/mcp}/tokend.keys/logger (100%) rename {mcp => packages/mcp}/tokend.keys/octopus (100%) rename {mcp => packages/mcp}/tokend.keys/printf (100%) rename {mcp => packages/mcp}/tokend.keys/pwnables (100%) rename {mcp => packages/mcp}/www/ctf.css (100%) rename {mcp => packages/mcp}/www/grunge.png (100%) rename {mcp => packages/mcp}/www/index.html (100%) rename {mcp => packages/mcp}/www/register.html (100%) rename {mcp => packages/mcp}/www/scoreboard.js (100%) rename {mcp => packages/mcp}/www/scoring.html (100%) rename {puzzles => packages}/net-re/.gitignore (100%) rename {puzzles => packages}/net-re/1/index.mdwn (100%) rename {puzzles => packages}/net-re/1/key (100%) rename {puzzles => packages}/net-re/10/index.mdwn (100%) rename {puzzles => packages}/net-re/10/key (100%) rename {puzzles => packages}/net-re/10/session.pcap (100%) rename {puzzles => packages}/net-re/100/index.mdwn (100%) rename {puzzles => packages}/net-re/100/key (100%) rename {puzzles => packages}/net-re/1000/index.mdwn (100%) rename {puzzles => packages}/net-re/1000/key (100%) rename {puzzles => packages}/net-re/1200/14b44ef250afd460b42d0947846b306e (100%) rename {puzzles => packages}/net-re/1200/hint (100%) rename {puzzles => packages}/net-re/1200/key (100%) rename {puzzles => packages}/net-re/2/index.mdwn (100%) rename {puzzles => packages}/net-re/2/key (100%) rename {puzzles => packages}/net-re/20/index.mdwn (100%) rename {puzzles => packages}/net-re/20/key (100%) rename {puzzles => packages}/net-re/20/session.pcap (100%) rename {puzzles => packages}/net-re/200/index.mdwn (100%) rename {puzzles => packages}/net-re/200/key (100%) rename {puzzles => packages}/net-re/2000/3k.pcap (100%) rename {puzzles => packages}/net-re/2000/index.mdwn (100%) rename {puzzles => packages}/net-re/2000/key (100%) rename {puzzles => packages}/net-re/250/example.com-1.pcap (100%) rename {puzzles => packages}/net-re/250/hint (100%) rename {puzzles => packages}/net-re/250/index.mdwn (100%) rename {puzzles => packages}/net-re/250/key (100%) rename {puzzles => packages}/net-re/25000/b143bbda4bbce4e81ac720a6bbc0d7c6 (100%) rename {puzzles => packages}/net-re/25000/hint (100%) rename {puzzles => packages}/net-re/25000/key (100%) rename {puzzles => packages}/net-re/3/index.mdwn (100%) rename {puzzles => packages}/net-re/3/key (100%) rename {puzzles => packages}/net-re/30/index.mdwn (100%) rename {puzzles => packages}/net-re/30/key (100%) rename {puzzles => packages}/net-re/30/session.pcap (100%) rename {puzzles => packages}/net-re/300/index.mdwn (100%) rename {puzzles => packages}/net-re/300/key (100%) rename {puzzles => packages}/net-re/300/session.pcap (100%) rename {puzzles => packages}/net-re/3000/12a18338d10d3a764f8d95e40b244cd2 (100%) rename {puzzles => packages}/net-re/3000/key (100%) rename {puzzles => packages}/net-re/4/index.mdwn (100%) rename {puzzles => packages}/net-re/4/key (100%) rename {puzzles => packages}/net-re/400/index.mdwn (100%) rename {puzzles => packages}/net-re/400/key (100%) rename {puzzles => packages}/net-re/400/session.pcap (100%) rename {puzzles => packages}/net-re/4000/e464f161483b4a2fd8b690a98932b703 (100%) rename {puzzles => packages}/net-re/4000/key (100%) rename {puzzles => packages}/net-re/5/example1.pcap (100%) rename {puzzles => packages}/net-re/5/index.mdwn (100%) rename {puzzles => packages}/net-re/5/key (100%) rename {puzzles => packages}/net-re/5/key.pcap (100%) rename {puzzles => packages}/net-re/5/ws-examine.png (100%) rename {puzzles => packages}/net-re/5/ws-follow.png (100%) rename {puzzles => packages}/net-re/5/ws-opened.png (100%) rename {puzzles => packages}/net-re/5/ws-start.png (100%) rename {puzzles => packages}/net-re/5/ws-stream.png (100%) rename {puzzles => packages}/net-re/5000/53127bca7fed4875920675c2c9e14597 (100%) rename {puzzles => packages}/net-re/5000/key (100%) rename {puzzles => packages}/net-re/6/index.mdwn (100%) rename {puzzles => packages}/net-re/6/key (100%) rename {puzzles => packages}/net-re/7/index.mdwn (100%) rename {puzzles => packages}/net-re/7/key (100%) rename {puzzles => packages}/net-re/700/index.mdwn (100%) rename {puzzles => packages}/net-re/700/key (100%) rename {puzzles => packages}/net-re/8/index.mdwn (100%) rename {puzzles => packages}/net-re/8/key (100%) rename {puzzles => packages}/net-re/800/index.mdwn (100%) rename {puzzles => packages}/net-re/800/key (100%) create mode 100644 packages/net-re/net-re.mk rename {puzzles => packages}/net-re/summary.txt (100%) create mode 100644 packages/octopus/octopus.mk rename {octopus => packages/octopus}/service/octopus/log/run (100%) rename {octopus => packages/octopus}/service/octopus/run (100%) rename {octopus => packages/octopus}/solution.sh (100%) rename {octopus => packages/octopus}/src/Makefile (100%) rename {octopus => packages/octopus}/src/octopus.c (100%) create mode 120000 packages/octopus/src/token.c create mode 120000 packages/octopus/src/token.h rename {octopus => packages/octopus}/tokens/octopus/category (100%) rename {octopus => packages/octopus}/tokens/octopus/category.key (100%) rename {octopus => packages/octopus}/tokens/octopus/enc.key (100%) create mode 100644 packages/packages.mk create mode 100644 packages/printf/printf.mk rename {printf => packages/printf}/service/printf/log/run (100%) rename {printf => packages/printf}/service/printf/run (100%) rename {printf => packages/printf}/service/printf/run-printf (100%) rename {printf => packages/printf}/src/Makefile (100%) rename {printf => packages/printf}/src/printf.c (100%) create mode 120000 packages/printf/src/token.c create mode 120000 packages/printf/src/token.h rename {printf => packages/printf}/tokens/printf0/category (100%) rename {printf => packages/printf}/tokens/printf0/category.key (100%) rename {printf => packages/printf}/tokens/printf0/enc.key (100%) rename {printf => packages/printf}/tokens/printf1/category (100%) rename {printf => packages/printf}/tokens/printf1/category.key (100%) rename {printf => packages/printf}/tokens/printf1/enc.key (100%) rename {printf => packages/printf}/tokens/printf2/category (100%) rename {printf => packages/printf}/tokens/printf2/category.key (100%) rename {printf => packages/printf}/tokens/printf2/enc.key (100%) rename {printf => packages/printf}/tokens/printf3/category (100%) rename {printf => packages/printf}/tokens/printf3/category.key (100%) rename {printf => packages/printf}/tokens/printf3/enc.key (100%) rename {printf => packages/printf}/tokens/printf4/category (100%) rename {printf => packages/printf}/tokens/printf4/category.key (100%) rename {printf => packages/printf}/tokens/printf4/enc.key (100%) create mode 100644 packages/pwnables/pwnables.mk rename {pwnables => packages/pwnables}/service/eth0.pwn/run (100%) rename {pwnables => packages/pwnables}/service/pwnables/log/run (100%) rename {pwnables => packages/pwnables}/service/pwnables/motd (100%) rename {pwnables => packages/pwnables}/service/pwnables/pwnie (100%) rename {pwnables => packages/pwnables}/service/pwnables/run (100%) rename {pwnables => packages/pwnables}/src/Makefile (100%) rename {pwnables => packages/pwnables}/src/arc4.c (100%) rename {pwnables => packages/pwnables}/src/gimmie.c (100%) rename {pwnables => packages/pwnables}/src/killme.c (100%) rename {pwnables => packages/pwnables}/src/ltraceme.c (100%) rename {pwnables => packages/pwnables}/src/straceme.c (100%) create mode 120000 packages/pwnables/src/token.c create mode 120000 packages/pwnables/src/token.h rename {pwnables => packages/pwnables}/tokens/gimmie/category (100%) rename {pwnables => packages/pwnables}/tokens/gimmie/category.key (100%) rename {pwnables => packages/pwnables}/tokens/gimmie/enc.key (100%) rename {pwnables => packages/pwnables}/tokens/killme/category (100%) rename {pwnables => packages/pwnables}/tokens/killme/category.key (100%) rename {pwnables => packages/pwnables}/tokens/killme/enc.key (100%) rename {pwnables => packages/pwnables}/tokens/ltraceme/category (100%) rename {pwnables => packages/pwnables}/tokens/ltraceme/category.key (100%) rename {pwnables => packages/pwnables}/tokens/ltraceme/enc.key (100%) rename {pwnables => packages/pwnables}/tokens/straceme/category (100%) rename {pwnables => packages/pwnables}/tokens/straceme/category.key (100%) rename {pwnables => packages/pwnables}/tokens/straceme/enc.key (100%) rename {puzzles => packages}/sequence/1/index.mdwn (100%) rename {puzzles => packages}/sequence/1/key (100%) rename {puzzles => packages}/sequence/100/index.mdwn (100%) rename {puzzles => packages}/sequence/100/key (100%) rename {puzzles => packages}/sequence/16/index.mdwn (100%) rename {puzzles => packages}/sequence/16/key (100%) rename {puzzles => packages}/sequence/19/index.mdwn (100%) rename {puzzles => packages}/sequence/19/key (100%) rename {puzzles => packages}/sequence/2/index.mdwn (100%) rename {puzzles => packages}/sequence/2/key (100%) rename {puzzles => packages}/sequence/200/index.mdwn (100%) rename {puzzles => packages}/sequence/200/key (100%) rename {puzzles => packages}/sequence/25/index.mdwn (100%) rename {puzzles => packages}/sequence/25/key (100%) rename {puzzles => packages}/sequence/300/index.mdwn (100%) rename {puzzles => packages}/sequence/300/key (100%) rename {puzzles => packages}/sequence/35/index.mdwn (100%) rename {puzzles => packages}/sequence/35/key (100%) rename {puzzles => packages}/sequence/400/index.mdwn (100%) rename {puzzles => packages}/sequence/400/key (100%) rename {puzzles => packages}/sequence/450/index.mdwn (100%) rename {puzzles => packages}/sequence/450/key (100%) rename {puzzles => packages}/sequence/50/index.mdwn (100%) rename {puzzles => packages}/sequence/50/key (100%) rename {puzzles => packages}/sequence/600/index.mdwn (100%) rename {puzzles => packages}/sequence/600/key (100%) rename {puzzles => packages}/sequence/700/index.mdwn (100%) rename {puzzles => packages}/sequence/700/key (100%) rename {puzzles => packages}/sequence/8/index.mdwn (100%) rename {puzzles => packages}/sequence/8/key (100%) create mode 100644 packages/sequence/sequence.mk rename {puzzles => packages}/sequence/summary.txt (100%) rename {puzzles => packages}/skynet/100/index.mdwn (100%) rename {puzzles => packages}/skynet/100/key (100%) rename {puzzles => packages}/skynet/100/malware.zip (100%) rename {puzzles => packages}/skynet/102/index.mdwn (100%) rename {puzzles => packages}/skynet/102/key (100%) rename {puzzles => packages}/skynet/102/malware.zip (100%) rename {puzzles => packages}/skynet/200/index.mdwn (100%) rename {puzzles => packages}/skynet/200/key (100%) rename {puzzles => packages}/skynet/200/malware.zip (100%) rename {puzzles => packages}/skynet/202/index.mdwn (100%) rename {puzzles => packages}/skynet/202/key (100%) rename {puzzles => packages}/skynet/202/malware.zip (100%) rename {puzzles => packages}/skynet/203/index.mdwn (100%) rename {puzzles => packages}/skynet/203/key (100%) rename {puzzles => packages}/skynet/203/malware.zip (100%) rename {puzzles => packages}/skynet/300/index.mdwn (100%) rename {puzzles => packages}/skynet/300/key (100%) rename {puzzles => packages}/skynet/300/malware.zip (100%) rename {puzzles => packages}/skynet/301/index.mdwn (100%) rename {puzzles => packages}/skynet/301/key (100%) rename {puzzles => packages}/skynet/301/malware.zip (100%) rename {puzzles => packages}/skynet/302/index.mdwn (100%) rename {puzzles => packages}/skynet/302/key (100%) rename {puzzles => packages}/skynet/302/malware.zip (100%) rename {puzzles => packages}/skynet/400/index.mdwn (100%) rename {puzzles => packages}/skynet/400/key (100%) rename {puzzles => packages}/skynet/400/malware.zip (100%) rename {puzzles => packages}/skynet/401/index.mdwn (100%) rename {puzzles => packages}/skynet/401/key (100%) rename {puzzles => packages}/skynet/401/malware.zip (100%) rename {puzzles => packages}/skynet/500/index.mdwn (100%) rename {puzzles => packages}/skynet/500/key (100%) rename {puzzles => packages}/skynet/500/laststage-unpacker.exe (100%) rename {puzzles => packages}/skynet/500/malware.zip (100%) rename {puzzles => packages}/skynet/501/index.mdwn (100%) rename {puzzles => packages}/skynet/501/key (100%) rename {puzzles => packages}/skynet/501/laststage-unpacker.exe (100%) rename {puzzles => packages}/skynet/501/malware.zip (100%) create mode 100644 packages/skynet/skynet.mk rename {puzzles => packages}/skynet/summary.txt (100%) rename {puzzles => packages}/steg/1/,index.gif (100%) rename {puzzles => packages}/steg/1/index.mdwn (100%) rename {puzzles => packages}/steg/1/key (100%) rename {puzzles => packages}/steg/10/Makefile (100%) rename {puzzles => packages}/steg/10/key (100%) rename {puzzles => packages}/steg/10/src.jpg (100%) rename {puzzles => packages}/steg/10/text.txt (100%) rename {puzzles => packages}/steg/100/Makefile (100%) rename {puzzles => packages}/steg/100/encode (100%) rename {puzzles => packages}/steg/100/image.cmds (100%) rename {puzzles => packages}/steg/100/image.exv (100%) rename {puzzles => packages}/steg/100/key (100%) rename {puzzles => packages}/steg/100/pristine/ww0207-43.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww0207-45.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww0207-90.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww0870-09.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww0870-11.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww0870-14.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-22.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-43.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-44.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-52.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-53.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1645-55.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1646-66.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1646-67.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1646-69.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1646-70.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1646-78.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1647-37.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1647-75.jpg (100%) rename {puzzles => packages}/steg/100/pristine/ww1647-85.jpg (100%) rename {puzzles => packages}/steg/15/Makefile (100%) rename {puzzles => packages}/steg/15/key (100%) rename {puzzles => packages}/steg/15/src.jpg (100%) rename {puzzles => packages}/steg/15/text.txt (100%) rename {puzzles => packages}/steg/2/key (100%) rename {puzzles => packages}/steg/2/test.docx (100%) rename {puzzles => packages}/steg/20/Makefile (100%) rename {puzzles => packages}/steg/20/key (100%) rename {puzzles => packages}/steg/20/src.jpg (100%) rename {puzzles => packages}/steg/20/text.txt (100%) rename {puzzles => packages}/steg/200/Makefile (100%) rename {puzzles => packages}/steg/200/encode (100%) rename {puzzles => packages}/steg/200/key (100%) rename {puzzles => packages}/steg/200/text.txt (100%) rename {puzzles => packages}/steg/3/key (100%) rename {puzzles => packages}/steg/3/test2.docx (100%) rename {puzzles => packages}/steg/30/Makefile (100%) rename {puzzles => packages}/steg/30/key (100%) rename {puzzles => packages}/steg/30/src.mp3 (100%) rename {puzzles => packages}/steg/30/text.txt (100%) rename {puzzles => packages}/steg/40/Makefile (100%) rename {puzzles => packages}/steg/40/encode (100%) rename {puzzles => packages}/steg/40/key (100%) rename {puzzles => packages}/steg/40/lena.png (100%) rename {puzzles => packages}/steg/40/text.txt (100%) create mode 100644 packages/steg/steg.mk rename {puzzles => packages}/steg/summary.txt (100%) rename {tokens => packages/tokens}/service/tokens/log/run (100%) rename {tokens => packages/tokens}/service/tokens/run (100%) rename {tokens => packages/tokens}/service/tokens/tokens (100%) rename {tokens => packages/tokens}/setup (100%) rename {tokens => packages/tokens}/src/Makefile (100%) rename {tokens => packages/tokens}/src/arc4-main.c (100%) create mode 120000 packages/tokens/src/arc4.c create mode 120000 packages/tokens/src/arc4.h rename {tokens => packages/tokens}/src/tokencli.c (100%) create mode 100644 packages/tokens/tokens.mk rename {puzzles => packages}/webapp/10/,binary.png (100%) rename {puzzles => packages}/webapp/10/,ctf.css (100%) rename {puzzles => packages}/webapp/10/1.cgi (100%) rename {puzzles => packages}/webapp/10/key (100%) rename {puzzles => packages}/webapp/20/,binary.png (100%) rename {puzzles => packages}/webapp/20/,ctf.css (100%) rename {puzzles => packages}/webapp/20/2.cgi (100%) rename {puzzles => packages}/webapp/20/key (100%) rename {puzzles => packages}/webapp/30/,binary.png (100%) rename {puzzles => packages}/webapp/30/,ctf.css (100%) rename {puzzles => packages}/webapp/30/3.cgi (100%) rename {puzzles => packages}/webapp/30/key (100%) rename {puzzles => packages}/webapp/summary.txt (100%) create mode 100644 packages/webapp/webapp.mk delete mode 100644 printf/printf.mk delete mode 120000 printf/src/token.c delete mode 120000 printf/src/token.h delete mode 100644 puzzles/puzzles.mk delete mode 100644 pwnables/pwnables.mk delete mode 120000 pwnables/src/token.c delete mode 120000 pwnables/src/token.h delete mode 120000 tokens/src/arc4.c delete mode 120000 tokens/src/arc4.h delete mode 100644 tokens/tokens.mk diff --git a/Makefile b/Makefile index e76f452..7817eea 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,6 @@ -PACKAGES = +BUILD = build +BIN = bin all: packages -define COPYTREE - mkdir -p $(2) - (cd $(1) && find . -not -name "*~" | cpio -o) | (cd $(2) && cpio -i) -endef - - -include */*.mk - -packages: $(addsuffix .pkg, $(PACKAGES)) - -install: $(addsuffix -install, $(PACKAGES)) - -clean: $(addsuffix -clean, $(PACKAGES)) - rm -rf build *.pkg *-install *-build - -%.pkg: %-install - mksquashfs build/$* $*.pkg -all-root -noappend +include packages/packages.mk diff --git a/common/arc4.c b/include/arc4.c similarity index 100% rename from common/arc4.c rename to include/arc4.c diff --git a/common/arc4.h b/include/arc4.h similarity index 100% rename from common/arc4.h rename to include/arc4.h diff --git a/common/isaac.c b/include/isaac.c similarity index 100% rename from common/isaac.c rename to include/isaac.c diff --git a/common/isaac.h b/include/isaac.h similarity index 100% rename from common/isaac.h rename to include/isaac.h diff --git a/common/token.c b/include/token.c similarity index 100% rename from common/token.c rename to include/token.c diff --git a/common/token.h b/include/token.h similarity index 100% rename from common/token.h rename to include/token.h diff --git a/logger/logger.mk b/logger/logger.mk deleted file mode 100644 index fc0df9a..0000000 --- a/logger/logger.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOGGER_PKGDIR = build/logger -LOGGER_PACKAGE = logger.pkg - -logger-install: logger-build - mkdir -p $(LOGGER_PKGDIR) - - mkdir -p $(LOGGER_PKGDIR)/bin/ - $(MAKE) -C logger/src install DESTDIR=$(CURDIR)/$(LOGGER_PKGDIR) - - $(call COPYTREE, logger/tokens, $(LOGGER_PKGDIR)/tokens) - - $(call COPYTREE, logger/service, $(LOGGER_PKGDIR)/service) - -logger-clean: - rm -rf $(LOGGER_PKGDIR) $(LOGGER_PACKAGE) - $(MAKE) -C logger/src clean - -logger-build: - $(MAKE) -C logger/src build - -PACKAGES += logger diff --git a/logger/src/token.c b/logger/src/token.c deleted file mode 120000 index 8c6738e..0000000 --- a/logger/src/token.c +++ /dev/null @@ -1 +0,0 @@ -../../common/token.c \ No newline at end of file diff --git a/logger/src/token.h b/logger/src/token.h deleted file mode 120000 index 25f916f..0000000 --- a/logger/src/token.h +++ /dev/null @@ -1 +0,0 @@ -../../common/token.h \ No newline at end of file diff --git a/mcp/mcp.mk b/mcp/mcp.mk deleted file mode 100644 index dd06d67..0000000 --- a/mcp/mcp.mk +++ /dev/null @@ -1,33 +0,0 @@ -MCP_PKGDIR = build/mcp -MCP_PACKAGE = mcp.pkg - -mcp-install: mcp-build - mkdir -p $(MCP_PKGDIR) - - $(call COPYTREE, mcp/bin, $(MCP_PKGDIR)/bin) - cp mcp/src/in.tokend $(MCP_PKGDIR)/bin/ - cp mcp/src/tokencli $(MCP_PKGDIR)/bin/ - cp mcp/src/tokencli $(MCP_PKGDIR)/bin/ - cp mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/ - - $(call COPYTREE, mcp/service, $(MCP_PKGDIR)/service) - - $(call COPYTREE, mcp/tokend.keys, $(MCP_PKGDIR)/tokend.keys) - - $(call COPYTREE, mcp/www, $(MCP_PKGDIR)/www) - cp mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/ - cp mcp/src/claim.cgi $(MCP_PKGDIR)/www/ - - touch $@ - -mcp-test: mcp-build - mcp/test.sh - -mcp-clean: - rm -rf $(MCP_PKGDIR) $(MCP_PACKAGE) mcp-install - $(MAKE) -C mcp/src clean - -mcp-build: - $(MAKE) -C mcp/src build - -PACKAGES += mcp \ No newline at end of file diff --git a/mcp/src/arc4.c b/mcp/src/arc4.c deleted file mode 120000 index 807950d..0000000 --- a/mcp/src/arc4.c +++ /dev/null @@ -1 +0,0 @@ -../../common/arc4.c \ No newline at end of file diff --git a/mcp/src/arc4.h b/mcp/src/arc4.h deleted file mode 120000 index 2d31392..0000000 --- a/mcp/src/arc4.h +++ /dev/null @@ -1 +0,0 @@ -../../common/arc4.h \ No newline at end of file diff --git a/puzzles/mkpuzzles b/mkpuzzles similarity index 100% rename from puzzles/mkpuzzles rename to mkpuzzles diff --git a/octopus/octopus.mk b/octopus/octopus.mk deleted file mode 100644 index e0b6844..0000000 --- a/octopus/octopus.mk +++ /dev/null @@ -1,20 +0,0 @@ -OCTOPUS_PKGDIR = build/octopus -OCTOPUS_PACKAGE = octopus.pkg - -octopus-install: octopus-build - mkdir -p $(OCTOPUS_PKGDIR)/bin/ - - $(call COPYTREE, octopus/service, $(OCTOPUS_PKGDIR)/service) - - $(call COPYTREE, octopus/tokens, $(OCTOPUS_PKGDIR)/tokens) - - cp octopus/src/octopus $(OCTOPUS_PKGDIR)/bin/ - -octopus-clean: - rm -rf $(OCTOPUS_PKGDIR) $(OCTOPUS_PACKAGE) - $(MAKE) -C octopus/src clean - -octopus-build: - $(MAKE) -C octopus/src build - -PACKAGES += octopus diff --git a/octopus/src/token.c b/octopus/src/token.c deleted file mode 120000 index 8c6738e..0000000 --- a/octopus/src/token.c +++ /dev/null @@ -1 +0,0 @@ -../../common/token.c \ No newline at end of file diff --git a/octopus/src/token.h b/octopus/src/token.h deleted file mode 120000 index 25f916f..0000000 --- a/octopus/src/token.h +++ /dev/null @@ -1 +0,0 @@ -../../common/token.h \ No newline at end of file diff --git a/puzzles/basemath/1/index.mdwn b/packages/basemath/1/index.mdwn similarity index 100% rename from puzzles/basemath/1/index.mdwn rename to packages/basemath/1/index.mdwn diff --git a/puzzles/basemath/1/key b/packages/basemath/1/key similarity index 100% rename from puzzles/basemath/1/key rename to packages/basemath/1/key diff --git a/puzzles/basemath/2/index.mdwn b/packages/basemath/2/index.mdwn similarity index 100% rename from puzzles/basemath/2/index.mdwn rename to packages/basemath/2/index.mdwn diff --git a/puzzles/basemath/2/key b/packages/basemath/2/key similarity index 100% rename from puzzles/basemath/2/key rename to packages/basemath/2/key diff --git a/puzzles/basemath/3/index.mdwn b/packages/basemath/3/index.mdwn similarity index 100% rename from puzzles/basemath/3/index.mdwn rename to packages/basemath/3/index.mdwn diff --git a/puzzles/basemath/3/key b/packages/basemath/3/key similarity index 100% rename from puzzles/basemath/3/key rename to packages/basemath/3/key diff --git a/puzzles/basemath/4/index.mdwn b/packages/basemath/4/index.mdwn similarity index 100% rename from puzzles/basemath/4/index.mdwn rename to packages/basemath/4/index.mdwn diff --git a/puzzles/basemath/4/key b/packages/basemath/4/key similarity index 100% rename from puzzles/basemath/4/key rename to packages/basemath/4/key diff --git a/puzzles/basemath/5/index.mdwn b/packages/basemath/5/index.mdwn similarity index 100% rename from puzzles/basemath/5/index.mdwn rename to packages/basemath/5/index.mdwn diff --git a/puzzles/basemath/5/key b/packages/basemath/5/key similarity index 100% rename from puzzles/basemath/5/key rename to packages/basemath/5/key diff --git a/packages/basemath/basemath.mk b/packages/basemath/basemath.mk new file mode 100644 index 0000000..df65f67 --- /dev/null +++ b/packages/basemath/basemath.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, basemath)) diff --git a/puzzles/basemath/summary.txt b/packages/basemath/summary.txt similarity index 100% rename from puzzles/basemath/summary.txt rename to packages/basemath/summary.txt diff --git a/puzzles/bletchley/100/key b/packages/bletchley/100/key similarity index 100% rename from puzzles/bletchley/100/key rename to packages/bletchley/100/key diff --git a/puzzles/bletchley/100/key.png b/packages/bletchley/100/key.png similarity index 100% rename from puzzles/bletchley/100/key.png rename to packages/bletchley/100/key.png diff --git a/puzzles/bletchley/1000/index.mdwn b/packages/bletchley/1000/index.mdwn similarity index 100% rename from puzzles/bletchley/1000/index.mdwn rename to packages/bletchley/1000/index.mdwn diff --git a/puzzles/bletchley/1000/key b/packages/bletchley/1000/key similarity index 100% rename from puzzles/bletchley/1000/key rename to packages/bletchley/1000/key diff --git a/puzzles/bletchley/150/aacaaebb0cd0503e7bad97c42321a738 b/packages/bletchley/150/aacaaebb0cd0503e7bad97c42321a738 similarity index 100% rename from puzzles/bletchley/150/aacaaebb0cd0503e7bad97c42321a738 rename to packages/bletchley/150/aacaaebb0cd0503e7bad97c42321a738 diff --git a/puzzles/bletchley/150/index.mdwn b/packages/bletchley/150/index.mdwn similarity index 100% rename from puzzles/bletchley/150/index.mdwn rename to packages/bletchley/150/index.mdwn diff --git a/puzzles/bletchley/150/key b/packages/bletchley/150/key similarity index 100% rename from puzzles/bletchley/150/key rename to packages/bletchley/150/key diff --git a/puzzles/bletchley/200/index.mdwn b/packages/bletchley/200/index.mdwn similarity index 100% rename from puzzles/bletchley/200/index.mdwn rename to packages/bletchley/200/index.mdwn diff --git a/puzzles/bletchley/200/key b/packages/bletchley/200/key similarity index 100% rename from puzzles/bletchley/200/key rename to packages/bletchley/200/key diff --git a/puzzles/bletchley/250/index.mdwn b/packages/bletchley/250/index.mdwn similarity index 100% rename from puzzles/bletchley/250/index.mdwn rename to packages/bletchley/250/index.mdwn diff --git a/puzzles/bletchley/250/key b/packages/bletchley/250/key similarity index 100% rename from puzzles/bletchley/250/key rename to packages/bletchley/250/key diff --git a/puzzles/bletchley/300/index.mdwn b/packages/bletchley/300/index.mdwn similarity index 100% rename from puzzles/bletchley/300/index.mdwn rename to packages/bletchley/300/index.mdwn diff --git a/puzzles/bletchley/300/key b/packages/bletchley/300/key similarity index 100% rename from puzzles/bletchley/300/key rename to packages/bletchley/300/key diff --git a/puzzles/bletchley/350/936bc08007a9076673a81040024728be b/packages/bletchley/350/936bc08007a9076673a81040024728be similarity index 100% rename from puzzles/bletchley/350/936bc08007a9076673a81040024728be rename to packages/bletchley/350/936bc08007a9076673a81040024728be diff --git a/puzzles/bletchley/350/key b/packages/bletchley/350/key similarity index 100% rename from puzzles/bletchley/350/key rename to packages/bletchley/350/key diff --git a/puzzles/bletchley/50/adddbafb502355634d9ef10e1848cf52 b/packages/bletchley/50/adddbafb502355634d9ef10e1848cf52 similarity index 100% rename from puzzles/bletchley/50/adddbafb502355634d9ef10e1848cf52 rename to packages/bletchley/50/adddbafb502355634d9ef10e1848cf52 diff --git a/puzzles/bletchley/50/key b/packages/bletchley/50/key similarity index 100% rename from puzzles/bletchley/50/key rename to packages/bletchley/50/key diff --git a/puzzles/bletchley/500/200601262232.ogg b/packages/bletchley/500/200601262232.ogg similarity index 100% rename from puzzles/bletchley/500/200601262232.ogg rename to packages/bletchley/500/200601262232.ogg diff --git a/puzzles/bletchley/500/cipher.txt b/packages/bletchley/500/cipher.txt similarity index 100% rename from puzzles/bletchley/500/cipher.txt rename to packages/bletchley/500/cipher.txt diff --git a/puzzles/bletchley/500/index.mdwn b/packages/bletchley/500/index.mdwn similarity index 100% rename from puzzles/bletchley/500/index.mdwn rename to packages/bletchley/500/index.mdwn diff --git a/puzzles/bletchley/500/key b/packages/bletchley/500/key similarity index 100% rename from puzzles/bletchley/500/key rename to packages/bletchley/500/key diff --git a/puzzles/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7 b/packages/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7 similarity index 100% rename from puzzles/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7 rename to packages/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7 diff --git a/puzzles/bletchley/900/key b/packages/bletchley/900/key similarity index 100% rename from puzzles/bletchley/900/key rename to packages/bletchley/900/key diff --git a/packages/bletchley/bletchley.mk b/packages/bletchley/bletchley.mk new file mode 100644 index 0000000..6fe9280 --- /dev/null +++ b/packages/bletchley/bletchley.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, bletchley)) diff --git a/puzzles/bletchley/summary.txt b/packages/bletchley/summary.txt similarity index 100% rename from puzzles/bletchley/summary.txt rename to packages/bletchley/summary.txt diff --git a/puzzles/codebreaking/1/index.mdwn b/packages/codebreaking/1/index.mdwn similarity index 100% rename from puzzles/codebreaking/1/index.mdwn rename to packages/codebreaking/1/index.mdwn diff --git a/puzzles/codebreaking/1/key b/packages/codebreaking/1/key similarity index 100% rename from puzzles/codebreaking/1/key rename to packages/codebreaking/1/key diff --git a/puzzles/codebreaking/2/index.mdwn b/packages/codebreaking/2/index.mdwn similarity index 100% rename from puzzles/codebreaking/2/index.mdwn rename to packages/codebreaking/2/index.mdwn diff --git a/puzzles/codebreaking/2/key b/packages/codebreaking/2/key similarity index 100% rename from puzzles/codebreaking/2/key rename to packages/codebreaking/2/key diff --git a/puzzles/codebreaking/3/dancing.png b/packages/codebreaking/3/dancing.png similarity index 100% rename from puzzles/codebreaking/3/dancing.png rename to packages/codebreaking/3/dancing.png diff --git a/puzzles/codebreaking/3/index.mdwn b/packages/codebreaking/3/index.mdwn similarity index 100% rename from puzzles/codebreaking/3/index.mdwn rename to packages/codebreaking/3/index.mdwn diff --git a/puzzles/codebreaking/3/key b/packages/codebreaking/3/key similarity index 100% rename from puzzles/codebreaking/3/key rename to packages/codebreaking/3/key diff --git a/puzzles/codebreaking/4/index.mdwn b/packages/codebreaking/4/index.mdwn similarity index 100% rename from puzzles/codebreaking/4/index.mdwn rename to packages/codebreaking/4/index.mdwn diff --git a/puzzles/codebreaking/4/key b/packages/codebreaking/4/key similarity index 100% rename from puzzles/codebreaking/4/key rename to packages/codebreaking/4/key diff --git a/puzzles/codebreaking/5/image.png b/packages/codebreaking/5/image.png similarity index 100% rename from puzzles/codebreaking/5/image.png rename to packages/codebreaking/5/image.png diff --git a/puzzles/codebreaking/5/key b/packages/codebreaking/5/key similarity index 100% rename from puzzles/codebreaking/5/key rename to packages/codebreaking/5/key diff --git a/puzzles/codebreaking/6/image.png b/packages/codebreaking/6/image.png similarity index 100% rename from puzzles/codebreaking/6/image.png rename to packages/codebreaking/6/image.png diff --git a/puzzles/codebreaking/6/key b/packages/codebreaking/6/key similarity index 100% rename from puzzles/codebreaking/6/key rename to packages/codebreaking/6/key diff --git a/puzzles/codebreaking/7/index.mdwn b/packages/codebreaking/7/index.mdwn similarity index 100% rename from puzzles/codebreaking/7/index.mdwn rename to packages/codebreaking/7/index.mdwn diff --git a/puzzles/codebreaking/7/key b/packages/codebreaking/7/key similarity index 100% rename from puzzles/codebreaking/7/key rename to packages/codebreaking/7/key diff --git a/puzzles/codebreaking/8/index.mdwn b/packages/codebreaking/8/index.mdwn similarity index 100% rename from puzzles/codebreaking/8/index.mdwn rename to packages/codebreaking/8/index.mdwn diff --git a/puzzles/codebreaking/8/key b/packages/codebreaking/8/key similarity index 100% rename from puzzles/codebreaking/8/key rename to packages/codebreaking/8/key diff --git a/packages/codebreaking/codebreaking.mk b/packages/codebreaking/codebreaking.mk new file mode 100644 index 0000000..6ecb730 --- /dev/null +++ b/packages/codebreaking/codebreaking.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, codebreaking)) diff --git a/puzzles/codebreaking/summary.txt b/packages/codebreaking/summary.txt similarity index 100% rename from puzzles/codebreaking/summary.txt rename to packages/codebreaking/summary.txt diff --git a/puzzles/compaq/100/index.mdwn b/packages/compaq/100/index.mdwn similarity index 100% rename from puzzles/compaq/100/index.mdwn rename to packages/compaq/100/index.mdwn diff --git a/puzzles/compaq/100/key b/packages/compaq/100/key similarity index 100% rename from puzzles/compaq/100/key rename to packages/compaq/100/key diff --git a/puzzles/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78 b/packages/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78 similarity index 100% rename from puzzles/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78 rename to packages/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78 diff --git a/puzzles/compaq/150/key b/packages/compaq/150/key similarity index 100% rename from puzzles/compaq/150/key rename to packages/compaq/150/key diff --git a/puzzles/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2 b/packages/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2 similarity index 100% rename from puzzles/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2 rename to packages/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2 diff --git a/puzzles/compaq/200/key b/packages/compaq/200/key similarity index 100% rename from puzzles/compaq/200/key rename to packages/compaq/200/key diff --git a/puzzles/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2 b/packages/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2 similarity index 100% rename from puzzles/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2 rename to packages/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2 diff --git a/puzzles/compaq/350/key b/packages/compaq/350/key similarity index 100% rename from puzzles/compaq/350/key rename to packages/compaq/350/key diff --git a/puzzles/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f b/packages/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f similarity index 100% rename from puzzles/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f rename to packages/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f diff --git a/puzzles/compaq/400/key b/packages/compaq/400/key similarity index 100% rename from puzzles/compaq/400/key rename to packages/compaq/400/key diff --git a/puzzles/compaq/50/index.mdwn b/packages/compaq/50/index.mdwn similarity index 100% rename from puzzles/compaq/50/index.mdwn rename to packages/compaq/50/index.mdwn diff --git a/puzzles/compaq/50/key b/packages/compaq/50/key similarity index 100% rename from puzzles/compaq/50/key rename to packages/compaq/50/key diff --git a/puzzles/compaq/500/02cb1e1d65a68b29ac851936c9bb4684 b/packages/compaq/500/02cb1e1d65a68b29ac851936c9bb4684 similarity index 100% rename from puzzles/compaq/500/02cb1e1d65a68b29ac851936c9bb4684 rename to packages/compaq/500/02cb1e1d65a68b29ac851936c9bb4684 diff --git a/puzzles/compaq/500/key b/packages/compaq/500/key similarity index 100% rename from puzzles/compaq/500/key rename to packages/compaq/500/key diff --git a/puzzles/compaq/600/daa36d50d4c807634dfd13a8239046de b/packages/compaq/600/daa36d50d4c807634dfd13a8239046de similarity index 100% rename from puzzles/compaq/600/daa36d50d4c807634dfd13a8239046de rename to packages/compaq/600/daa36d50d4c807634dfd13a8239046de diff --git a/puzzles/compaq/600/key b/packages/compaq/600/key similarity index 100% rename from puzzles/compaq/600/key rename to packages/compaq/600/key diff --git a/packages/compaq/compaq.mk b/packages/compaq/compaq.mk new file mode 100644 index 0000000..a40684e --- /dev/null +++ b/packages/compaq/compaq.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, compaq)) diff --git a/puzzles/compaq/summary.txt b/packages/compaq/summary.txt similarity index 100% rename from puzzles/compaq/summary.txt rename to packages/compaq/summary.txt diff --git a/puzzles/crypto/1/index.mdwn b/packages/crypto/1/index.mdwn similarity index 100% rename from puzzles/crypto/1/index.mdwn rename to packages/crypto/1/index.mdwn diff --git a/puzzles/crypto/1/key b/packages/crypto/1/key similarity index 100% rename from puzzles/crypto/1/key rename to packages/crypto/1/key diff --git a/puzzles/crypto/100/index.mdwn b/packages/crypto/100/index.mdwn similarity index 100% rename from puzzles/crypto/100/index.mdwn rename to packages/crypto/100/index.mdwn diff --git a/puzzles/crypto/100/key b/packages/crypto/100/key similarity index 100% rename from puzzles/crypto/100/key rename to packages/crypto/100/key diff --git a/puzzles/crypto/100caesar.py b/packages/crypto/100caesar.py similarity index 100% rename from puzzles/crypto/100caesar.py rename to packages/crypto/100caesar.py diff --git a/puzzles/crypto/110/index.mdwn b/packages/crypto/110/index.mdwn similarity index 100% rename from puzzles/crypto/110/index.mdwn rename to packages/crypto/110/index.mdwn diff --git a/puzzles/crypto/110/key b/packages/crypto/110/key similarity index 100% rename from puzzles/crypto/110/key rename to packages/crypto/110/key diff --git a/puzzles/crypto/110substitution.py b/packages/crypto/110substitution.py similarity index 100% rename from puzzles/crypto/110substitution.py rename to packages/crypto/110substitution.py diff --git a/puzzles/crypto/120/index.mdwn b/packages/crypto/120/index.mdwn similarity index 100% rename from puzzles/crypto/120/index.mdwn rename to packages/crypto/120/index.mdwn diff --git a/puzzles/crypto/120/key b/packages/crypto/120/key similarity index 100% rename from puzzles/crypto/120/key rename to packages/crypto/120/key diff --git a/puzzles/crypto/120binary.py b/packages/crypto/120binary.py similarity index 100% rename from puzzles/crypto/120binary.py rename to packages/crypto/120binary.py diff --git a/puzzles/crypto/130/index.mdwn b/packages/crypto/130/index.mdwn similarity index 100% rename from puzzles/crypto/130/index.mdwn rename to packages/crypto/130/index.mdwn diff --git a/puzzles/crypto/130/key b/packages/crypto/130/key similarity index 100% rename from puzzles/crypto/130/key rename to packages/crypto/130/key diff --git a/puzzles/crypto/130manchester.py b/packages/crypto/130manchester.py similarity index 100% rename from puzzles/crypto/130manchester.py rename to packages/crypto/130manchester.py diff --git a/puzzles/crypto/140/index.mdwn b/packages/crypto/140/index.mdwn similarity index 100% rename from puzzles/crypto/140/index.mdwn rename to packages/crypto/140/index.mdwn diff --git a/puzzles/crypto/140/key b/packages/crypto/140/key similarity index 100% rename from puzzles/crypto/140/key rename to packages/crypto/140/key diff --git a/puzzles/crypto/140morris.py b/packages/crypto/140morris.py similarity index 100% rename from puzzles/crypto/140morris.py rename to packages/crypto/140morris.py diff --git a/puzzles/crypto/150/index.mdwn b/packages/crypto/150/index.mdwn similarity index 100% rename from puzzles/crypto/150/index.mdwn rename to packages/crypto/150/index.mdwn diff --git a/puzzles/crypto/150/key b/packages/crypto/150/key similarity index 100% rename from puzzles/crypto/150/key rename to packages/crypto/150/key diff --git a/puzzles/crypto/150sbox.py b/packages/crypto/150sbox.py similarity index 100% rename from puzzles/crypto/150sbox.py rename to packages/crypto/150sbox.py diff --git a/puzzles/crypto/160/index.mdwn b/packages/crypto/160/index.mdwn similarity index 100% rename from puzzles/crypto/160/index.mdwn rename to packages/crypto/160/index.mdwn diff --git a/puzzles/crypto/160/key b/packages/crypto/160/key similarity index 100% rename from puzzles/crypto/160/key rename to packages/crypto/160/key diff --git a/puzzles/crypto/160xor.py b/packages/crypto/160xor.py similarity index 100% rename from puzzles/crypto/160xor.py rename to packages/crypto/160xor.py diff --git a/puzzles/crypto/170/index.mdwn b/packages/crypto/170/index.mdwn similarity index 100% rename from puzzles/crypto/170/index.mdwn rename to packages/crypto/170/index.mdwn diff --git a/puzzles/crypto/170/key b/packages/crypto/170/key similarity index 100% rename from puzzles/crypto/170/key rename to packages/crypto/170/key diff --git a/puzzles/crypto/170transpose.py b/packages/crypto/170transpose.py similarity index 100% rename from puzzles/crypto/170transpose.py rename to packages/crypto/170transpose.py diff --git a/puzzles/crypto/180/index.mdwn b/packages/crypto/180/index.mdwn similarity index 100% rename from puzzles/crypto/180/index.mdwn rename to packages/crypto/180/index.mdwn diff --git a/puzzles/crypto/180/key b/packages/crypto/180/key similarity index 100% rename from puzzles/crypto/180/key rename to packages/crypto/180/key diff --git a/puzzles/crypto/180rotate.py b/packages/crypto/180rotate.py similarity index 100% rename from puzzles/crypto/180rotate.py rename to packages/crypto/180rotate.py diff --git a/puzzles/crypto/190/index.mdwn b/packages/crypto/190/index.mdwn similarity index 100% rename from puzzles/crypto/190/index.mdwn rename to packages/crypto/190/index.mdwn diff --git a/puzzles/crypto/190rotate.py b/packages/crypto/190rotate.py similarity index 100% rename from puzzles/crypto/190rotate.py rename to packages/crypto/190rotate.py diff --git a/puzzles/crypto/200/key b/packages/crypto/200/key similarity index 100% rename from puzzles/crypto/200/key rename to packages/crypto/200/key diff --git a/puzzles/crypto/200cbc.py b/packages/crypto/200cbc.py similarity index 100% rename from puzzles/crypto/200cbc.py rename to packages/crypto/200cbc.py diff --git a/puzzles/crypto/210/index.mdwn b/packages/crypto/210/index.mdwn similarity index 100% rename from puzzles/crypto/210/index.mdwn rename to packages/crypto/210/index.mdwn diff --git a/puzzles/crypto/210/key b/packages/crypto/210/key similarity index 100% rename from puzzles/crypto/210/key rename to packages/crypto/210/key diff --git a/puzzles/crypto/210cbc.py b/packages/crypto/210cbc.py similarity index 100% rename from puzzles/crypto/210cbc.py rename to packages/crypto/210cbc.py diff --git a/puzzles/crypto/220/index.mdwn b/packages/crypto/220/index.mdwn similarity index 100% rename from puzzles/crypto/220/index.mdwn rename to packages/crypto/220/index.mdwn diff --git a/puzzles/crypto/220/key b/packages/crypto/220/key similarity index 100% rename from puzzles/crypto/220/key rename to packages/crypto/220/key diff --git a/puzzles/crypto/220cbc.py b/packages/crypto/220cbc.py similarity index 100% rename from puzzles/crypto/220cbc.py rename to packages/crypto/220cbc.py diff --git a/puzzles/crypto/230/index.mdwn b/packages/crypto/230/index.mdwn similarity index 100% rename from puzzles/crypto/230/index.mdwn rename to packages/crypto/230/index.mdwn diff --git a/puzzles/crypto/230/key b/packages/crypto/230/key similarity index 100% rename from puzzles/crypto/230/key rename to packages/crypto/230/key diff --git a/puzzles/crypto/230cbc.py b/packages/crypto/230cbc.py similarity index 100% rename from puzzles/crypto/230cbc.py rename to packages/crypto/230cbc.py diff --git a/puzzles/crypto/240/index.mdwn b/packages/crypto/240/index.mdwn similarity index 100% rename from puzzles/crypto/240/index.mdwn rename to packages/crypto/240/index.mdwn diff --git a/puzzles/crypto/240/key b/packages/crypto/240/key similarity index 100% rename from puzzles/crypto/240/key rename to packages/crypto/240/key diff --git a/puzzles/crypto/240diffie.py b/packages/crypto/240diffie.py similarity index 100% rename from puzzles/crypto/240diffie.py rename to packages/crypto/240diffie.py diff --git a/puzzles/crypto/400/index.mdwn b/packages/crypto/400/index.mdwn similarity index 100% rename from puzzles/crypto/400/index.mdwn rename to packages/crypto/400/index.mdwn diff --git a/puzzles/crypto/400/key b/packages/crypto/400/key similarity index 100% rename from puzzles/crypto/400/key rename to packages/crypto/400/key diff --git a/puzzles/crypto/400onetimepad.py b/packages/crypto/400onetimepad.py similarity index 100% rename from puzzles/crypto/400onetimepad.py rename to packages/crypto/400onetimepad.py diff --git a/puzzles/crypto/cbc.py b/packages/crypto/cbc.py similarity index 100% rename from puzzles/crypto/cbc.py rename to packages/crypto/cbc.py diff --git a/packages/crypto/crypto.mk b/packages/crypto/crypto.mk new file mode 100644 index 0000000..72c16ba --- /dev/null +++ b/packages/crypto/crypto.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, crypto)) diff --git a/puzzles/crypto/crypto.py b/packages/crypto/crypto.py similarity index 100% rename from puzzles/crypto/crypto.py rename to packages/crypto/crypto.py diff --git a/puzzles/crypto/diffie.py b/packages/crypto/diffie.py similarity index 100% rename from puzzles/crypto/diffie.py rename to packages/crypto/diffie.py diff --git a/puzzles/crypto/transform.py b/packages/crypto/transform.py similarity index 100% rename from puzzles/crypto/transform.py rename to packages/crypto/transform.py diff --git a/puzzles/forensics/10/index.html b/packages/forensics/10/index.html similarity index 100% rename from puzzles/forensics/10/index.html rename to packages/forensics/10/index.html diff --git a/puzzles/forensics/10/key b/packages/forensics/10/key similarity index 100% rename from puzzles/forensics/10/key rename to packages/forensics/10/key diff --git a/puzzles/forensics/100/index.html b/packages/forensics/100/index.html similarity index 100% rename from puzzles/forensics/100/index.html rename to packages/forensics/100/index.html diff --git a/puzzles/forensics/100/key b/packages/forensics/100/key similarity index 100% rename from puzzles/forensics/100/key rename to packages/forensics/100/key diff --git a/puzzles/forensics/20/index.html b/packages/forensics/20/index.html similarity index 100% rename from puzzles/forensics/20/index.html rename to packages/forensics/20/index.html diff --git a/puzzles/forensics/20/key b/packages/forensics/20/key similarity index 100% rename from puzzles/forensics/20/key rename to packages/forensics/20/key diff --git a/puzzles/forensics/200/index.html b/packages/forensics/200/index.html similarity index 100% rename from puzzles/forensics/200/index.html rename to packages/forensics/200/index.html diff --git a/puzzles/forensics/200/key b/packages/forensics/200/key similarity index 100% rename from puzzles/forensics/200/key rename to packages/forensics/200/key diff --git a/puzzles/forensics/250/index.html b/packages/forensics/250/index.html similarity index 100% rename from puzzles/forensics/250/index.html rename to packages/forensics/250/index.html diff --git a/puzzles/forensics/250/key b/packages/forensics/250/key similarity index 100% rename from puzzles/forensics/250/key rename to packages/forensics/250/key diff --git a/puzzles/forensics/400/index.html b/packages/forensics/400/index.html similarity index 100% rename from puzzles/forensics/400/index.html rename to packages/forensics/400/index.html diff --git a/puzzles/forensics/400/key b/packages/forensics/400/key similarity index 100% rename from puzzles/forensics/400/key rename to packages/forensics/400/key diff --git a/puzzles/forensics/50/index.html b/packages/forensics/50/index.html similarity index 100% rename from puzzles/forensics/50/index.html rename to packages/forensics/50/index.html diff --git a/puzzles/forensics/50/key b/packages/forensics/50/key similarity index 100% rename from puzzles/forensics/50/key rename to packages/forensics/50/key diff --git a/packages/forensics/forensics.mk b/packages/forensics/forensics.mk new file mode 100644 index 0000000..1a83f2e --- /dev/null +++ b/packages/forensics/forensics.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, forensics)) diff --git a/puzzles/hackme/100/index.mdwn b/packages/hackme/100/index.mdwn similarity index 100% rename from puzzles/hackme/100/index.mdwn rename to packages/hackme/100/index.mdwn diff --git a/puzzles/hackme/200/index.mdwn b/packages/hackme/200/index.mdwn similarity index 100% rename from puzzles/hackme/200/index.mdwn rename to packages/hackme/200/index.mdwn diff --git a/puzzles/hackme/200/key b/packages/hackme/200/key similarity index 100% rename from puzzles/hackme/200/key rename to packages/hackme/200/key diff --git a/puzzles/hackme/274/index.mdwn b/packages/hackme/274/index.mdwn similarity index 100% rename from puzzles/hackme/274/index.mdwn rename to packages/hackme/274/index.mdwn diff --git a/puzzles/hackme/300/index.mdwn b/packages/hackme/300/index.mdwn similarity index 100% rename from puzzles/hackme/300/index.mdwn rename to packages/hackme/300/index.mdwn diff --git a/puzzles/hackme/614/index.mdwn b/packages/hackme/614/index.mdwn similarity index 100% rename from puzzles/hackme/614/index.mdwn rename to packages/hackme/614/index.mdwn diff --git a/puzzles/hackme/614/key b/packages/hackme/614/key similarity index 100% rename from puzzles/hackme/614/key rename to packages/hackme/614/key diff --git a/puzzles/hackme/806/index.mdwn b/packages/hackme/806/index.mdwn similarity index 100% rename from puzzles/hackme/806/index.mdwn rename to packages/hackme/806/index.mdwn diff --git a/puzzles/hackme/806/key b/packages/hackme/806/key similarity index 100% rename from puzzles/hackme/806/key rename to packages/hackme/806/key diff --git a/packages/hackme/hackme.mk b/packages/hackme/hackme.mk new file mode 100644 index 0000000..4fe858c --- /dev/null +++ b/packages/hackme/hackme.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, hackme)) diff --git a/puzzles/hackme/summary.txt b/packages/hackme/summary.txt similarity index 100% rename from puzzles/hackme/summary.txt rename to packages/hackme/summary.txt diff --git a/packages/logger/logger.mk b/packages/logger/logger.mk new file mode 100644 index 0000000..a3d5ac4 --- /dev/null +++ b/packages/logger/logger.mk @@ -0,0 +1,20 @@ +LOGGER_PKGDIR = $(BUILD)/logger + +logger-install: logger-build + mkdir -p $(LOGGER_PKGDIR) + + mkdir -p $(LOGGER_PKGDIR)/bin/ + $(MAKE) -C packages/logger/src install DESTDIR=$(CURDIR)/$(LOGGER_PKGDIR) + + $(call COPYTREE, packages/logger/tokens, $(LOGGER_PKGDIR)/tokens) + + $(call COPYTREE, packages/logger/service, $(LOGGER_PKGDIR)/service) + +logger-clean: + rm -rf $(LOGGER_PKGDIR) + $(MAKE) -C packages/logger/src clean + +logger-build: + $(MAKE) -C packages/logger/src build + +PACKAGES += logger diff --git a/logger/service/logger/log/run b/packages/logger/service/logger/log/run similarity index 100% rename from logger/service/logger/log/run rename to packages/logger/service/logger/log/run diff --git a/logger/service/logger/run b/packages/logger/service/logger/run similarity index 100% rename from logger/service/logger/run rename to packages/logger/service/logger/run diff --git a/logger/src/COPYING b/packages/logger/src/COPYING similarity index 100% rename from logger/src/COPYING rename to packages/logger/src/COPYING diff --git a/logger/src/Makefile b/packages/logger/src/Makefile similarity index 100% rename from logger/src/Makefile rename to packages/logger/src/Makefile diff --git a/logger/src/logger.c b/packages/logger/src/logger.c similarity index 100% rename from logger/src/logger.c rename to packages/logger/src/logger.c diff --git a/packages/logger/src/token.c b/packages/logger/src/token.c new file mode 120000 index 0000000..f0a9dcd --- /dev/null +++ b/packages/logger/src/token.c @@ -0,0 +1 @@ +../../../include/token.c \ No newline at end of file diff --git a/packages/logger/src/token.h b/packages/logger/src/token.h new file mode 120000 index 0000000..21e62e4 --- /dev/null +++ b/packages/logger/src/token.h @@ -0,0 +1 @@ +../../../include/token.h \ No newline at end of file diff --git a/logger/tokens/logger0/category b/packages/logger/tokens/logger0/category similarity index 100% rename from logger/tokens/logger0/category rename to packages/logger/tokens/logger0/category diff --git a/logger/tokens/logger0/category.key b/packages/logger/tokens/logger0/category.key similarity index 100% rename from logger/tokens/logger0/category.key rename to packages/logger/tokens/logger0/category.key diff --git a/logger/tokens/logger0/enc.key b/packages/logger/tokens/logger0/enc.key similarity index 100% rename from logger/tokens/logger0/enc.key rename to packages/logger/tokens/logger0/enc.key diff --git a/logger/tokens/logger1/category b/packages/logger/tokens/logger1/category similarity index 100% rename from logger/tokens/logger1/category rename to packages/logger/tokens/logger1/category diff --git a/logger/tokens/logger1/category.key b/packages/logger/tokens/logger1/category.key similarity index 100% rename from logger/tokens/logger1/category.key rename to packages/logger/tokens/logger1/category.key diff --git a/logger/tokens/logger1/enc.key b/packages/logger/tokens/logger1/enc.key similarity index 100% rename from logger/tokens/logger1/enc.key rename to packages/logger/tokens/logger1/enc.key diff --git a/logger/tokens/logger2/category b/packages/logger/tokens/logger2/category similarity index 100% rename from logger/tokens/logger2/category rename to packages/logger/tokens/logger2/category diff --git a/logger/tokens/logger2/category.key b/packages/logger/tokens/logger2/category.key similarity index 100% rename from logger/tokens/logger2/category.key rename to packages/logger/tokens/logger2/category.key diff --git a/logger/tokens/logger2/enc.key b/packages/logger/tokens/logger2/enc.key similarity index 100% rename from logger/tokens/logger2/enc.key rename to packages/logger/tokens/logger2/enc.key diff --git a/mcp/Makefile b/packages/mcp/Makefile similarity index 100% rename from mcp/Makefile rename to packages/mcp/Makefile diff --git a/mcp/bin/addteam b/packages/mcp/bin/addteam similarity index 100% rename from mcp/bin/addteam rename to packages/mcp/bin/addteam diff --git a/mcp/bin/run-ctf b/packages/mcp/bin/run-ctf similarity index 100% rename from mcp/bin/run-ctf rename to packages/mcp/bin/run-ctf diff --git a/mcp/bin/scoreboard b/packages/mcp/bin/scoreboard similarity index 100% rename from mcp/bin/scoreboard rename to packages/mcp/bin/scoreboard diff --git a/mcp/bin/teams.sh b/packages/mcp/bin/teams.sh similarity index 100% rename from mcp/bin/teams.sh rename to packages/mcp/bin/teams.sh diff --git a/packages/mcp/mcp.mk b/packages/mcp/mcp.mk new file mode 100644 index 0000000..b37b77e --- /dev/null +++ b/packages/mcp/mcp.mk @@ -0,0 +1,30 @@ +MCP_PKGDIR = $(BUILD)/mcp + +mcp-install: mcp-build + mkdir -p $(MCP_PKGDIR) + + $(call COPYTREE, packages/mcp/bin, $(MCP_PKGDIR)/bin) + cp packages/mcp/src/in.tokend $(MCP_PKGDIR)/bin/ + cp packages/mcp/src/tokencli $(MCP_PKGDIR)/bin/ + cp packages/mcp/src/tokencli $(MCP_PKGDIR)/bin/ + cp packages/mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/ + + $(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service) + + $(call COPYTREE, packages/mcp/tokend.keys, $(MCP_PKGDIR)/tokend.keys) + + $(call COPYTREE, packages/mcp/www, $(MCP_PKGDIR)/www) + cp packages/mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/ + cp packages/mcp/src/claim.cgi $(MCP_PKGDIR)/www/ + +mcp-test: mcp-build + packages/mcp/test.sh + +mcp-clean: + rm -rf $(MCP_PKGDIR) + $(MAKE) -C packages/mcp/src clean + +mcp-build: + $(MAKE) -C packages/mcp/src build + +PACKAGES += mcp \ No newline at end of file diff --git a/mcp/service/eth0/run b/packages/mcp/service/eth0/run similarity index 100% rename from mcp/service/eth0/run rename to packages/mcp/service/eth0/run diff --git a/mcp/service/httpd/log/run b/packages/mcp/service/httpd/log/run similarity index 100% rename from mcp/service/httpd/log/run rename to packages/mcp/service/httpd/log/run diff --git a/mcp/service/httpd/mathopd.conf b/packages/mcp/service/httpd/mathopd.conf similarity index 100% rename from mcp/service/httpd/mathopd.conf rename to packages/mcp/service/httpd/mathopd.conf diff --git a/mcp/service/httpd/run b/packages/mcp/service/httpd/run similarity index 100% rename from mcp/service/httpd/run rename to packages/mcp/service/httpd/run diff --git a/mcp/service/ircd/log/run b/packages/mcp/service/ircd/log/run similarity index 100% rename from mcp/service/ircd/log/run rename to packages/mcp/service/ircd/log/run diff --git a/mcp/service/ircd/ngircd.conf b/packages/mcp/service/ircd/ngircd.conf similarity index 100% rename from mcp/service/ircd/ngircd.conf rename to packages/mcp/service/ircd/ngircd.conf diff --git a/mcp/service/ircd/run b/packages/mcp/service/ircd/run similarity index 100% rename from mcp/service/ircd/run rename to packages/mcp/service/ircd/run diff --git a/mcp/service/pointsd/log/run b/packages/mcp/service/pointsd/log/run similarity index 100% rename from mcp/service/pointsd/log/run rename to packages/mcp/service/pointsd/log/run diff --git a/mcp/service/pointsd/pointsd b/packages/mcp/service/pointsd/pointsd similarity index 100% rename from mcp/service/pointsd/pointsd rename to packages/mcp/service/pointsd/pointsd diff --git a/mcp/service/pointsd/run b/packages/mcp/service/pointsd/run similarity index 100% rename from mcp/service/pointsd/run rename to packages/mcp/service/pointsd/run diff --git a/mcp/service/puzzled/log/run b/packages/mcp/service/puzzled/log/run similarity index 100% rename from mcp/service/puzzled/log/run rename to packages/mcp/service/puzzled/log/run diff --git a/mcp/service/puzzled/puzzled b/packages/mcp/service/puzzled/puzzled similarity index 100% rename from mcp/service/puzzled/puzzled rename to packages/mcp/service/puzzled/puzzled diff --git a/mcp/service/puzzled/run b/packages/mcp/service/puzzled/run similarity index 100% rename from mcp/service/puzzled/run rename to packages/mcp/service/puzzled/run diff --git a/mcp/service/sshd/log/run b/packages/mcp/service/sshd/log/run similarity index 100% rename from mcp/service/sshd/log/run rename to packages/mcp/service/sshd/log/run diff --git a/mcp/service/sshd/rsa.key b/packages/mcp/service/sshd/rsa.key similarity index 100% rename from mcp/service/sshd/rsa.key rename to packages/mcp/service/sshd/rsa.key diff --git a/mcp/service/sshd/run b/packages/mcp/service/sshd/run similarity index 100% rename from mcp/service/sshd/run rename to packages/mcp/service/sshd/run diff --git a/mcp/service/tokend/log/run b/packages/mcp/service/tokend/log/run similarity index 100% rename from mcp/service/tokend/log/run rename to packages/mcp/service/tokend/log/run diff --git a/mcp/service/tokend/run b/packages/mcp/service/tokend/run similarity index 100% rename from mcp/service/tokend/run rename to packages/mcp/service/tokend/run diff --git a/mcp/src/Makefile b/packages/mcp/src/Makefile similarity index 100% rename from mcp/src/Makefile rename to packages/mcp/src/Makefile diff --git a/packages/mcp/src/arc4.c b/packages/mcp/src/arc4.c new file mode 120000 index 0000000..0c6a48f --- /dev/null +++ b/packages/mcp/src/arc4.c @@ -0,0 +1 @@ +../../../include/arc4.c \ No newline at end of file diff --git a/packages/mcp/src/arc4.h b/packages/mcp/src/arc4.h new file mode 120000 index 0000000..d102bb2 --- /dev/null +++ b/packages/mcp/src/arc4.h @@ -0,0 +1 @@ +../../../include/arc4.h \ No newline at end of file diff --git a/mcp/src/claim.cgi.c b/packages/mcp/src/claim.cgi.c similarity index 100% rename from mcp/src/claim.cgi.c rename to packages/mcp/src/claim.cgi.c diff --git a/mcp/src/common.c b/packages/mcp/src/common.c similarity index 100% rename from mcp/src/common.c rename to packages/mcp/src/common.c diff --git a/mcp/src/common.h b/packages/mcp/src/common.h similarity index 100% rename from mcp/src/common.h rename to packages/mcp/src/common.h diff --git a/mcp/src/in.tokend.c b/packages/mcp/src/in.tokend.c similarity index 100% rename from mcp/src/in.tokend.c rename to packages/mcp/src/in.tokend.c diff --git a/mcp/src/pointscli.c b/packages/mcp/src/pointscli.c similarity index 100% rename from mcp/src/pointscli.c rename to packages/mcp/src/pointscli.c diff --git a/mcp/src/puzzler.cgi.c b/packages/mcp/src/puzzler.cgi.c similarity index 100% rename from mcp/src/puzzler.cgi.c rename to packages/mcp/src/puzzler.cgi.c diff --git a/mcp/src/puzzles.cgi.c b/packages/mcp/src/puzzles.cgi.c similarity index 100% rename from mcp/src/puzzles.cgi.c rename to packages/mcp/src/puzzles.cgi.c diff --git a/mcp/src/src.mk b/packages/mcp/src/src.mk similarity index 100% rename from mcp/src/src.mk rename to packages/mcp/src/src.mk diff --git a/mcp/src/tokencli.c b/packages/mcp/src/tokencli.c similarity index 100% rename from mcp/src/tokencli.c rename to packages/mcp/src/tokencli.c diff --git a/mcp/test.sh b/packages/mcp/test.sh similarity index 100% rename from mcp/test.sh rename to packages/mcp/test.sh diff --git a/mcp/tokend.keys/logger b/packages/mcp/tokend.keys/logger similarity index 100% rename from mcp/tokend.keys/logger rename to packages/mcp/tokend.keys/logger diff --git a/mcp/tokend.keys/octopus b/packages/mcp/tokend.keys/octopus similarity index 100% rename from mcp/tokend.keys/octopus rename to packages/mcp/tokend.keys/octopus diff --git a/mcp/tokend.keys/printf b/packages/mcp/tokend.keys/printf similarity index 100% rename from mcp/tokend.keys/printf rename to packages/mcp/tokend.keys/printf diff --git a/mcp/tokend.keys/pwnables b/packages/mcp/tokend.keys/pwnables similarity index 100% rename from mcp/tokend.keys/pwnables rename to packages/mcp/tokend.keys/pwnables diff --git a/mcp/www/ctf.css b/packages/mcp/www/ctf.css similarity index 100% rename from mcp/www/ctf.css rename to packages/mcp/www/ctf.css diff --git a/mcp/www/grunge.png b/packages/mcp/www/grunge.png similarity index 100% rename from mcp/www/grunge.png rename to packages/mcp/www/grunge.png diff --git a/mcp/www/index.html b/packages/mcp/www/index.html similarity index 100% rename from mcp/www/index.html rename to packages/mcp/www/index.html diff --git a/mcp/www/register.html b/packages/mcp/www/register.html similarity index 100% rename from mcp/www/register.html rename to packages/mcp/www/register.html diff --git a/mcp/www/scoreboard.js b/packages/mcp/www/scoreboard.js similarity index 100% rename from mcp/www/scoreboard.js rename to packages/mcp/www/scoreboard.js diff --git a/mcp/www/scoring.html b/packages/mcp/www/scoring.html similarity index 100% rename from mcp/www/scoring.html rename to packages/mcp/www/scoring.html diff --git a/puzzles/net-re/.gitignore b/packages/net-re/.gitignore similarity index 100% rename from puzzles/net-re/.gitignore rename to packages/net-re/.gitignore diff --git a/puzzles/net-re/1/index.mdwn b/packages/net-re/1/index.mdwn similarity index 100% rename from puzzles/net-re/1/index.mdwn rename to packages/net-re/1/index.mdwn diff --git a/puzzles/net-re/1/key b/packages/net-re/1/key similarity index 100% rename from puzzles/net-re/1/key rename to packages/net-re/1/key diff --git a/puzzles/net-re/10/index.mdwn b/packages/net-re/10/index.mdwn similarity index 100% rename from puzzles/net-re/10/index.mdwn rename to packages/net-re/10/index.mdwn diff --git a/puzzles/net-re/10/key b/packages/net-re/10/key similarity index 100% rename from puzzles/net-re/10/key rename to packages/net-re/10/key diff --git a/puzzles/net-re/10/session.pcap b/packages/net-re/10/session.pcap similarity index 100% rename from puzzles/net-re/10/session.pcap rename to packages/net-re/10/session.pcap diff --git a/puzzles/net-re/100/index.mdwn b/packages/net-re/100/index.mdwn similarity index 100% rename from puzzles/net-re/100/index.mdwn rename to packages/net-re/100/index.mdwn diff --git a/puzzles/net-re/100/key b/packages/net-re/100/key similarity index 100% rename from puzzles/net-re/100/key rename to packages/net-re/100/key diff --git a/puzzles/net-re/1000/index.mdwn b/packages/net-re/1000/index.mdwn similarity index 100% rename from puzzles/net-re/1000/index.mdwn rename to packages/net-re/1000/index.mdwn diff --git a/puzzles/net-re/1000/key b/packages/net-re/1000/key similarity index 100% rename from puzzles/net-re/1000/key rename to packages/net-re/1000/key diff --git a/puzzles/net-re/1200/14b44ef250afd460b42d0947846b306e b/packages/net-re/1200/14b44ef250afd460b42d0947846b306e similarity index 100% rename from puzzles/net-re/1200/14b44ef250afd460b42d0947846b306e rename to packages/net-re/1200/14b44ef250afd460b42d0947846b306e diff --git a/puzzles/net-re/1200/hint b/packages/net-re/1200/hint similarity index 100% rename from puzzles/net-re/1200/hint rename to packages/net-re/1200/hint diff --git a/puzzles/net-re/1200/key b/packages/net-re/1200/key similarity index 100% rename from puzzles/net-re/1200/key rename to packages/net-re/1200/key diff --git a/puzzles/net-re/2/index.mdwn b/packages/net-re/2/index.mdwn similarity index 100% rename from puzzles/net-re/2/index.mdwn rename to packages/net-re/2/index.mdwn diff --git a/puzzles/net-re/2/key b/packages/net-re/2/key similarity index 100% rename from puzzles/net-re/2/key rename to packages/net-re/2/key diff --git a/puzzles/net-re/20/index.mdwn b/packages/net-re/20/index.mdwn similarity index 100% rename from puzzles/net-re/20/index.mdwn rename to packages/net-re/20/index.mdwn diff --git a/puzzles/net-re/20/key b/packages/net-re/20/key similarity index 100% rename from puzzles/net-re/20/key rename to packages/net-re/20/key diff --git a/puzzles/net-re/20/session.pcap b/packages/net-re/20/session.pcap similarity index 100% rename from puzzles/net-re/20/session.pcap rename to packages/net-re/20/session.pcap diff --git a/puzzles/net-re/200/index.mdwn b/packages/net-re/200/index.mdwn similarity index 100% rename from puzzles/net-re/200/index.mdwn rename to packages/net-re/200/index.mdwn diff --git a/puzzles/net-re/200/key b/packages/net-re/200/key similarity index 100% rename from puzzles/net-re/200/key rename to packages/net-re/200/key diff --git a/puzzles/net-re/2000/3k.pcap b/packages/net-re/2000/3k.pcap similarity index 100% rename from puzzles/net-re/2000/3k.pcap rename to packages/net-re/2000/3k.pcap diff --git a/puzzles/net-re/2000/index.mdwn b/packages/net-re/2000/index.mdwn similarity index 100% rename from puzzles/net-re/2000/index.mdwn rename to packages/net-re/2000/index.mdwn diff --git a/puzzles/net-re/2000/key b/packages/net-re/2000/key similarity index 100% rename from puzzles/net-re/2000/key rename to packages/net-re/2000/key diff --git a/puzzles/net-re/250/example.com-1.pcap b/packages/net-re/250/example.com-1.pcap similarity index 100% rename from puzzles/net-re/250/example.com-1.pcap rename to packages/net-re/250/example.com-1.pcap diff --git a/puzzles/net-re/250/hint b/packages/net-re/250/hint similarity index 100% rename from puzzles/net-re/250/hint rename to packages/net-re/250/hint diff --git a/puzzles/net-re/250/index.mdwn b/packages/net-re/250/index.mdwn similarity index 100% rename from puzzles/net-re/250/index.mdwn rename to packages/net-re/250/index.mdwn diff --git a/puzzles/net-re/250/key b/packages/net-re/250/key similarity index 100% rename from puzzles/net-re/250/key rename to packages/net-re/250/key diff --git a/puzzles/net-re/25000/b143bbda4bbce4e81ac720a6bbc0d7c6 b/packages/net-re/25000/b143bbda4bbce4e81ac720a6bbc0d7c6 similarity index 100% rename from puzzles/net-re/25000/b143bbda4bbce4e81ac720a6bbc0d7c6 rename to packages/net-re/25000/b143bbda4bbce4e81ac720a6bbc0d7c6 diff --git a/puzzles/net-re/25000/hint b/packages/net-re/25000/hint similarity index 100% rename from puzzles/net-re/25000/hint rename to packages/net-re/25000/hint diff --git a/puzzles/net-re/25000/key b/packages/net-re/25000/key similarity index 100% rename from puzzles/net-re/25000/key rename to packages/net-re/25000/key diff --git a/puzzles/net-re/3/index.mdwn b/packages/net-re/3/index.mdwn similarity index 100% rename from puzzles/net-re/3/index.mdwn rename to packages/net-re/3/index.mdwn diff --git a/puzzles/net-re/3/key b/packages/net-re/3/key similarity index 100% rename from puzzles/net-re/3/key rename to packages/net-re/3/key diff --git a/puzzles/net-re/30/index.mdwn b/packages/net-re/30/index.mdwn similarity index 100% rename from puzzles/net-re/30/index.mdwn rename to packages/net-re/30/index.mdwn diff --git a/puzzles/net-re/30/key b/packages/net-re/30/key similarity index 100% rename from puzzles/net-re/30/key rename to packages/net-re/30/key diff --git a/puzzles/net-re/30/session.pcap b/packages/net-re/30/session.pcap similarity index 100% rename from puzzles/net-re/30/session.pcap rename to packages/net-re/30/session.pcap diff --git a/puzzles/net-re/300/index.mdwn b/packages/net-re/300/index.mdwn similarity index 100% rename from puzzles/net-re/300/index.mdwn rename to packages/net-re/300/index.mdwn diff --git a/puzzles/net-re/300/key b/packages/net-re/300/key similarity index 100% rename from puzzles/net-re/300/key rename to packages/net-re/300/key diff --git a/puzzles/net-re/300/session.pcap b/packages/net-re/300/session.pcap similarity index 100% rename from puzzles/net-re/300/session.pcap rename to packages/net-re/300/session.pcap diff --git a/puzzles/net-re/3000/12a18338d10d3a764f8d95e40b244cd2 b/packages/net-re/3000/12a18338d10d3a764f8d95e40b244cd2 similarity index 100% rename from puzzles/net-re/3000/12a18338d10d3a764f8d95e40b244cd2 rename to packages/net-re/3000/12a18338d10d3a764f8d95e40b244cd2 diff --git a/puzzles/net-re/3000/key b/packages/net-re/3000/key similarity index 100% rename from puzzles/net-re/3000/key rename to packages/net-re/3000/key diff --git a/puzzles/net-re/4/index.mdwn b/packages/net-re/4/index.mdwn similarity index 100% rename from puzzles/net-re/4/index.mdwn rename to packages/net-re/4/index.mdwn diff --git a/puzzles/net-re/4/key b/packages/net-re/4/key similarity index 100% rename from puzzles/net-re/4/key rename to packages/net-re/4/key diff --git a/puzzles/net-re/400/index.mdwn b/packages/net-re/400/index.mdwn similarity index 100% rename from puzzles/net-re/400/index.mdwn rename to packages/net-re/400/index.mdwn diff --git a/puzzles/net-re/400/key b/packages/net-re/400/key similarity index 100% rename from puzzles/net-re/400/key rename to packages/net-re/400/key diff --git a/puzzles/net-re/400/session.pcap b/packages/net-re/400/session.pcap similarity index 100% rename from puzzles/net-re/400/session.pcap rename to packages/net-re/400/session.pcap diff --git a/puzzles/net-re/4000/e464f161483b4a2fd8b690a98932b703 b/packages/net-re/4000/e464f161483b4a2fd8b690a98932b703 similarity index 100% rename from puzzles/net-re/4000/e464f161483b4a2fd8b690a98932b703 rename to packages/net-re/4000/e464f161483b4a2fd8b690a98932b703 diff --git a/puzzles/net-re/4000/key b/packages/net-re/4000/key similarity index 100% rename from puzzles/net-re/4000/key rename to packages/net-re/4000/key diff --git a/puzzles/net-re/5/example1.pcap b/packages/net-re/5/example1.pcap similarity index 100% rename from puzzles/net-re/5/example1.pcap rename to packages/net-re/5/example1.pcap diff --git a/puzzles/net-re/5/index.mdwn b/packages/net-re/5/index.mdwn similarity index 100% rename from puzzles/net-re/5/index.mdwn rename to packages/net-re/5/index.mdwn diff --git a/puzzles/net-re/5/key b/packages/net-re/5/key similarity index 100% rename from puzzles/net-re/5/key rename to packages/net-re/5/key diff --git a/puzzles/net-re/5/key.pcap b/packages/net-re/5/key.pcap similarity index 100% rename from puzzles/net-re/5/key.pcap rename to packages/net-re/5/key.pcap diff --git a/puzzles/net-re/5/ws-examine.png b/packages/net-re/5/ws-examine.png similarity index 100% rename from puzzles/net-re/5/ws-examine.png rename to packages/net-re/5/ws-examine.png diff --git a/puzzles/net-re/5/ws-follow.png b/packages/net-re/5/ws-follow.png similarity index 100% rename from puzzles/net-re/5/ws-follow.png rename to packages/net-re/5/ws-follow.png diff --git a/puzzles/net-re/5/ws-opened.png b/packages/net-re/5/ws-opened.png similarity index 100% rename from puzzles/net-re/5/ws-opened.png rename to packages/net-re/5/ws-opened.png diff --git a/puzzles/net-re/5/ws-start.png b/packages/net-re/5/ws-start.png similarity index 100% rename from puzzles/net-re/5/ws-start.png rename to packages/net-re/5/ws-start.png diff --git a/puzzles/net-re/5/ws-stream.png b/packages/net-re/5/ws-stream.png similarity index 100% rename from puzzles/net-re/5/ws-stream.png rename to packages/net-re/5/ws-stream.png diff --git a/puzzles/net-re/5000/53127bca7fed4875920675c2c9e14597 b/packages/net-re/5000/53127bca7fed4875920675c2c9e14597 similarity index 100% rename from puzzles/net-re/5000/53127bca7fed4875920675c2c9e14597 rename to packages/net-re/5000/53127bca7fed4875920675c2c9e14597 diff --git a/puzzles/net-re/5000/key b/packages/net-re/5000/key similarity index 100% rename from puzzles/net-re/5000/key rename to packages/net-re/5000/key diff --git a/puzzles/net-re/6/index.mdwn b/packages/net-re/6/index.mdwn similarity index 100% rename from puzzles/net-re/6/index.mdwn rename to packages/net-re/6/index.mdwn diff --git a/puzzles/net-re/6/key b/packages/net-re/6/key similarity index 100% rename from puzzles/net-re/6/key rename to packages/net-re/6/key diff --git a/puzzles/net-re/7/index.mdwn b/packages/net-re/7/index.mdwn similarity index 100% rename from puzzles/net-re/7/index.mdwn rename to packages/net-re/7/index.mdwn diff --git a/puzzles/net-re/7/key b/packages/net-re/7/key similarity index 100% rename from puzzles/net-re/7/key rename to packages/net-re/7/key diff --git a/puzzles/net-re/700/index.mdwn b/packages/net-re/700/index.mdwn similarity index 100% rename from puzzles/net-re/700/index.mdwn rename to packages/net-re/700/index.mdwn diff --git a/puzzles/net-re/700/key b/packages/net-re/700/key similarity index 100% rename from puzzles/net-re/700/key rename to packages/net-re/700/key diff --git a/puzzles/net-re/8/index.mdwn b/packages/net-re/8/index.mdwn similarity index 100% rename from puzzles/net-re/8/index.mdwn rename to packages/net-re/8/index.mdwn diff --git a/puzzles/net-re/8/key b/packages/net-re/8/key similarity index 100% rename from puzzles/net-re/8/key rename to packages/net-re/8/key diff --git a/puzzles/net-re/800/index.mdwn b/packages/net-re/800/index.mdwn similarity index 100% rename from puzzles/net-re/800/index.mdwn rename to packages/net-re/800/index.mdwn diff --git a/puzzles/net-re/800/key b/packages/net-re/800/key similarity index 100% rename from puzzles/net-re/800/key rename to packages/net-re/800/key diff --git a/packages/net-re/net-re.mk b/packages/net-re/net-re.mk new file mode 100644 index 0000000..f1a0e0d --- /dev/null +++ b/packages/net-re/net-re.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, net-re)) diff --git a/puzzles/net-re/summary.txt b/packages/net-re/summary.txt similarity index 100% rename from puzzles/net-re/summary.txt rename to packages/net-re/summary.txt diff --git a/packages/octopus/octopus.mk b/packages/octopus/octopus.mk new file mode 100644 index 0000000..103a92c --- /dev/null +++ b/packages/octopus/octopus.mk @@ -0,0 +1,19 @@ +OCTOPUS_PKGDIR = $(BUILD)/octopus + +octopus-install: octopus-build + mkdir -p $(OCTOPUS_PKGDIR)/bin/ + + $(call COPYTREE, packages/octopus/service, $(OCTOPUS_PKGDIR)/service) + + $(call COPYTREE, packages/octopus/tokens, $(OCTOPUS_PKGDIR)/tokens) + + cp packages/octopus/src/octopus $(OCTOPUS_PKGDIR)/bin/ + +octopus-clean: + rm -rf $(OCTOPUS_PKGDIR) + $(MAKE) -C packages/octopus/src clean + +octopus-build: + $(MAKE) -C packages/octopus/src build + +PACKAGES += octopus diff --git a/octopus/service/octopus/log/run b/packages/octopus/service/octopus/log/run similarity index 100% rename from octopus/service/octopus/log/run rename to packages/octopus/service/octopus/log/run diff --git a/octopus/service/octopus/run b/packages/octopus/service/octopus/run similarity index 100% rename from octopus/service/octopus/run rename to packages/octopus/service/octopus/run diff --git a/octopus/solution.sh b/packages/octopus/solution.sh similarity index 100% rename from octopus/solution.sh rename to packages/octopus/solution.sh diff --git a/octopus/src/Makefile b/packages/octopus/src/Makefile similarity index 100% rename from octopus/src/Makefile rename to packages/octopus/src/Makefile diff --git a/octopus/src/octopus.c b/packages/octopus/src/octopus.c similarity index 100% rename from octopus/src/octopus.c rename to packages/octopus/src/octopus.c diff --git a/packages/octopus/src/token.c b/packages/octopus/src/token.c new file mode 120000 index 0000000..f0a9dcd --- /dev/null +++ b/packages/octopus/src/token.c @@ -0,0 +1 @@ +../../../include/token.c \ No newline at end of file diff --git a/packages/octopus/src/token.h b/packages/octopus/src/token.h new file mode 120000 index 0000000..21e62e4 --- /dev/null +++ b/packages/octopus/src/token.h @@ -0,0 +1 @@ +../../../include/token.h \ No newline at end of file diff --git a/octopus/tokens/octopus/category b/packages/octopus/tokens/octopus/category similarity index 100% rename from octopus/tokens/octopus/category rename to packages/octopus/tokens/octopus/category diff --git a/octopus/tokens/octopus/category.key b/packages/octopus/tokens/octopus/category.key similarity index 100% rename from octopus/tokens/octopus/category.key rename to packages/octopus/tokens/octopus/category.key diff --git a/octopus/tokens/octopus/enc.key b/packages/octopus/tokens/octopus/enc.key similarity index 100% rename from octopus/tokens/octopus/enc.key rename to packages/octopus/tokens/octopus/enc.key diff --git a/packages/packages.mk b/packages/packages.mk new file mode 100644 index 0000000..89d3c4c --- /dev/null +++ b/packages/packages.mk @@ -0,0 +1,38 @@ +PACKAGES = + +define COPYTREE + mkdir -p $(2) + (cd $(1) && find . -not -name "*~" | cpio -o) | (cd $(2) && cpio -i) +endef + +define STANDARD_PUZZLE +t=$(strip $1) +$t-install: + mkdir -p $(BUILD)/$t + ./mkpuzzles packages/$t $(BUILD)/$t + +$t-clean: + rm -rf $(BUILD)/$t $(BIN)/$t.pkg + +PACKAGES += $t +endef + +include packages/*/*.mk + +# Make foo depend on foo.pkg +$(foreach p, $(PACKAGES), $(eval $p: $(BIN)/$p.pkg)) + +packages: $(patsubst %, $(BIN)/%.pkg, $(PACKAGES)) + +install: $(addsuffix -install, $(PACKAGES)) + +clean: $(addsuffix -clean, $(PACKAGES)) + rm -rf $(BUILD) $(BIN) + +$(foreach p, $(PACKAGES), $(eval $p-clean: $p-pkgclean)) +%-pkgclean: + rm -f $(BIN)/$*.pkg + +$(BIN)/%.pkg: %-install + @ mkdir -p $(@D) + mksquashfs $(BUILD)/$* $@ -all-root -noappend diff --git a/packages/printf/printf.mk b/packages/printf/printf.mk new file mode 100644 index 0000000..14a9474 --- /dev/null +++ b/packages/printf/printf.mk @@ -0,0 +1,20 @@ +PRINTF_PKGDIR = $(BUILD)/printf + +printf-install: printf-build + mkdir -p $(PRINTF_PKGDIR) + + mkdir -p $(PRINTF_PKGDIR)/bin/ + $(MAKE) -C packages/printf/src install DESTDIR=$(CURDIR)/$(PRINTF_PKGDIR) + + $(call COPYTREE, packages/printf/tokens, $(PRINTF_PKGDIR)/tokens) + + $(call COPYTREE, packages/printf/service, $(PRINTF_PKGDIR)/service) + +printf-clean: + rm -rf $(PRINTF_PKGDIR) + $(MAKE) -C packages/printf/src clean + +printf-build: + $(MAKE) -C packages/printf/src build + +PACKAGES += printf diff --git a/printf/service/printf/log/run b/packages/printf/service/printf/log/run similarity index 100% rename from printf/service/printf/log/run rename to packages/printf/service/printf/log/run diff --git a/printf/service/printf/run b/packages/printf/service/printf/run similarity index 100% rename from printf/service/printf/run rename to packages/printf/service/printf/run diff --git a/printf/service/printf/run-printf b/packages/printf/service/printf/run-printf similarity index 100% rename from printf/service/printf/run-printf rename to packages/printf/service/printf/run-printf diff --git a/printf/src/Makefile b/packages/printf/src/Makefile similarity index 100% rename from printf/src/Makefile rename to packages/printf/src/Makefile diff --git a/printf/src/printf.c b/packages/printf/src/printf.c similarity index 100% rename from printf/src/printf.c rename to packages/printf/src/printf.c diff --git a/packages/printf/src/token.c b/packages/printf/src/token.c new file mode 120000 index 0000000..f0a9dcd --- /dev/null +++ b/packages/printf/src/token.c @@ -0,0 +1 @@ +../../../include/token.c \ No newline at end of file diff --git a/packages/printf/src/token.h b/packages/printf/src/token.h new file mode 120000 index 0000000..21e62e4 --- /dev/null +++ b/packages/printf/src/token.h @@ -0,0 +1 @@ +../../../include/token.h \ No newline at end of file diff --git a/printf/tokens/printf0/category b/packages/printf/tokens/printf0/category similarity index 100% rename from printf/tokens/printf0/category rename to packages/printf/tokens/printf0/category diff --git a/printf/tokens/printf0/category.key b/packages/printf/tokens/printf0/category.key similarity index 100% rename from printf/tokens/printf0/category.key rename to packages/printf/tokens/printf0/category.key diff --git a/printf/tokens/printf0/enc.key b/packages/printf/tokens/printf0/enc.key similarity index 100% rename from printf/tokens/printf0/enc.key rename to packages/printf/tokens/printf0/enc.key diff --git a/printf/tokens/printf1/category b/packages/printf/tokens/printf1/category similarity index 100% rename from printf/tokens/printf1/category rename to packages/printf/tokens/printf1/category diff --git a/printf/tokens/printf1/category.key b/packages/printf/tokens/printf1/category.key similarity index 100% rename from printf/tokens/printf1/category.key rename to packages/printf/tokens/printf1/category.key diff --git a/printf/tokens/printf1/enc.key b/packages/printf/tokens/printf1/enc.key similarity index 100% rename from printf/tokens/printf1/enc.key rename to packages/printf/tokens/printf1/enc.key diff --git a/printf/tokens/printf2/category b/packages/printf/tokens/printf2/category similarity index 100% rename from printf/tokens/printf2/category rename to packages/printf/tokens/printf2/category diff --git a/printf/tokens/printf2/category.key b/packages/printf/tokens/printf2/category.key similarity index 100% rename from printf/tokens/printf2/category.key rename to packages/printf/tokens/printf2/category.key diff --git a/printf/tokens/printf2/enc.key b/packages/printf/tokens/printf2/enc.key similarity index 100% rename from printf/tokens/printf2/enc.key rename to packages/printf/tokens/printf2/enc.key diff --git a/printf/tokens/printf3/category b/packages/printf/tokens/printf3/category similarity index 100% rename from printf/tokens/printf3/category rename to packages/printf/tokens/printf3/category diff --git a/printf/tokens/printf3/category.key b/packages/printf/tokens/printf3/category.key similarity index 100% rename from printf/tokens/printf3/category.key rename to packages/printf/tokens/printf3/category.key diff --git a/printf/tokens/printf3/enc.key b/packages/printf/tokens/printf3/enc.key similarity index 100% rename from printf/tokens/printf3/enc.key rename to packages/printf/tokens/printf3/enc.key diff --git a/printf/tokens/printf4/category b/packages/printf/tokens/printf4/category similarity index 100% rename from printf/tokens/printf4/category rename to packages/printf/tokens/printf4/category diff --git a/printf/tokens/printf4/category.key b/packages/printf/tokens/printf4/category.key similarity index 100% rename from printf/tokens/printf4/category.key rename to packages/printf/tokens/printf4/category.key diff --git a/printf/tokens/printf4/enc.key b/packages/printf/tokens/printf4/enc.key similarity index 100% rename from printf/tokens/printf4/enc.key rename to packages/printf/tokens/printf4/enc.key diff --git a/packages/pwnables/pwnables.mk b/packages/pwnables/pwnables.mk new file mode 100644 index 0000000..c45477d --- /dev/null +++ b/packages/pwnables/pwnables.mk @@ -0,0 +1,20 @@ +PWNABLES_PKGDIR = $(BUILD)/pwnables + +pwnables-install: pwnables-build + mkdir -p $(PWNABLES_PKGDIR) + + mkdir -p $(PWNABLES_PKGDIR)/bin/ + $(MAKE) -C packages/pwnables/src install DESTDIR=$(CURDIR)/$(PWNABLES_PKGDIR) + + $(call COPYTREE, packages/pwnables/tokens, $(PWNABLES_PKGDIR)/tokens) + + $(call COPYTREE, packages/pwnables/service, $(PWNABLES_PKGDIR)/service) + +pwnables-clean: + rm -rf $(PWNABLES_PKGDIR) + $(MAKE) -C packages/pwnables/src clean + +pwnables-build: + $(MAKE) -C packages/pwnables/src build + +PACKAGES += pwnables diff --git a/pwnables/service/eth0.pwn/run b/packages/pwnables/service/eth0.pwn/run similarity index 100% rename from pwnables/service/eth0.pwn/run rename to packages/pwnables/service/eth0.pwn/run diff --git a/pwnables/service/pwnables/log/run b/packages/pwnables/service/pwnables/log/run similarity index 100% rename from pwnables/service/pwnables/log/run rename to packages/pwnables/service/pwnables/log/run diff --git a/pwnables/service/pwnables/motd b/packages/pwnables/service/pwnables/motd similarity index 100% rename from pwnables/service/pwnables/motd rename to packages/pwnables/service/pwnables/motd diff --git a/pwnables/service/pwnables/pwnie b/packages/pwnables/service/pwnables/pwnie similarity index 100% rename from pwnables/service/pwnables/pwnie rename to packages/pwnables/service/pwnables/pwnie diff --git a/pwnables/service/pwnables/run b/packages/pwnables/service/pwnables/run similarity index 100% rename from pwnables/service/pwnables/run rename to packages/pwnables/service/pwnables/run diff --git a/pwnables/src/Makefile b/packages/pwnables/src/Makefile similarity index 100% rename from pwnables/src/Makefile rename to packages/pwnables/src/Makefile diff --git a/pwnables/src/arc4.c b/packages/pwnables/src/arc4.c similarity index 100% rename from pwnables/src/arc4.c rename to packages/pwnables/src/arc4.c diff --git a/pwnables/src/gimmie.c b/packages/pwnables/src/gimmie.c similarity index 100% rename from pwnables/src/gimmie.c rename to packages/pwnables/src/gimmie.c diff --git a/pwnables/src/killme.c b/packages/pwnables/src/killme.c similarity index 100% rename from pwnables/src/killme.c rename to packages/pwnables/src/killme.c diff --git a/pwnables/src/ltraceme.c b/packages/pwnables/src/ltraceme.c similarity index 100% rename from pwnables/src/ltraceme.c rename to packages/pwnables/src/ltraceme.c diff --git a/pwnables/src/straceme.c b/packages/pwnables/src/straceme.c similarity index 100% rename from pwnables/src/straceme.c rename to packages/pwnables/src/straceme.c diff --git a/packages/pwnables/src/token.c b/packages/pwnables/src/token.c new file mode 120000 index 0000000..f0a9dcd --- /dev/null +++ b/packages/pwnables/src/token.c @@ -0,0 +1 @@ +../../../include/token.c \ No newline at end of file diff --git a/packages/pwnables/src/token.h b/packages/pwnables/src/token.h new file mode 120000 index 0000000..21e62e4 --- /dev/null +++ b/packages/pwnables/src/token.h @@ -0,0 +1 @@ +../../../include/token.h \ No newline at end of file diff --git a/pwnables/tokens/gimmie/category b/packages/pwnables/tokens/gimmie/category similarity index 100% rename from pwnables/tokens/gimmie/category rename to packages/pwnables/tokens/gimmie/category diff --git a/pwnables/tokens/gimmie/category.key b/packages/pwnables/tokens/gimmie/category.key similarity index 100% rename from pwnables/tokens/gimmie/category.key rename to packages/pwnables/tokens/gimmie/category.key diff --git a/pwnables/tokens/gimmie/enc.key b/packages/pwnables/tokens/gimmie/enc.key similarity index 100% rename from pwnables/tokens/gimmie/enc.key rename to packages/pwnables/tokens/gimmie/enc.key diff --git a/pwnables/tokens/killme/category b/packages/pwnables/tokens/killme/category similarity index 100% rename from pwnables/tokens/killme/category rename to packages/pwnables/tokens/killme/category diff --git a/pwnables/tokens/killme/category.key b/packages/pwnables/tokens/killme/category.key similarity index 100% rename from pwnables/tokens/killme/category.key rename to packages/pwnables/tokens/killme/category.key diff --git a/pwnables/tokens/killme/enc.key b/packages/pwnables/tokens/killme/enc.key similarity index 100% rename from pwnables/tokens/killme/enc.key rename to packages/pwnables/tokens/killme/enc.key diff --git a/pwnables/tokens/ltraceme/category b/packages/pwnables/tokens/ltraceme/category similarity index 100% rename from pwnables/tokens/ltraceme/category rename to packages/pwnables/tokens/ltraceme/category diff --git a/pwnables/tokens/ltraceme/category.key b/packages/pwnables/tokens/ltraceme/category.key similarity index 100% rename from pwnables/tokens/ltraceme/category.key rename to packages/pwnables/tokens/ltraceme/category.key diff --git a/pwnables/tokens/ltraceme/enc.key b/packages/pwnables/tokens/ltraceme/enc.key similarity index 100% rename from pwnables/tokens/ltraceme/enc.key rename to packages/pwnables/tokens/ltraceme/enc.key diff --git a/pwnables/tokens/straceme/category b/packages/pwnables/tokens/straceme/category similarity index 100% rename from pwnables/tokens/straceme/category rename to packages/pwnables/tokens/straceme/category diff --git a/pwnables/tokens/straceme/category.key b/packages/pwnables/tokens/straceme/category.key similarity index 100% rename from pwnables/tokens/straceme/category.key rename to packages/pwnables/tokens/straceme/category.key diff --git a/pwnables/tokens/straceme/enc.key b/packages/pwnables/tokens/straceme/enc.key similarity index 100% rename from pwnables/tokens/straceme/enc.key rename to packages/pwnables/tokens/straceme/enc.key diff --git a/puzzles/sequence/1/index.mdwn b/packages/sequence/1/index.mdwn similarity index 100% rename from puzzles/sequence/1/index.mdwn rename to packages/sequence/1/index.mdwn diff --git a/puzzles/sequence/1/key b/packages/sequence/1/key similarity index 100% rename from puzzles/sequence/1/key rename to packages/sequence/1/key diff --git a/puzzles/sequence/100/index.mdwn b/packages/sequence/100/index.mdwn similarity index 100% rename from puzzles/sequence/100/index.mdwn rename to packages/sequence/100/index.mdwn diff --git a/puzzles/sequence/100/key b/packages/sequence/100/key similarity index 100% rename from puzzles/sequence/100/key rename to packages/sequence/100/key diff --git a/puzzles/sequence/16/index.mdwn b/packages/sequence/16/index.mdwn similarity index 100% rename from puzzles/sequence/16/index.mdwn rename to packages/sequence/16/index.mdwn diff --git a/puzzles/sequence/16/key b/packages/sequence/16/key similarity index 100% rename from puzzles/sequence/16/key rename to packages/sequence/16/key diff --git a/puzzles/sequence/19/index.mdwn b/packages/sequence/19/index.mdwn similarity index 100% rename from puzzles/sequence/19/index.mdwn rename to packages/sequence/19/index.mdwn diff --git a/puzzles/sequence/19/key b/packages/sequence/19/key similarity index 100% rename from puzzles/sequence/19/key rename to packages/sequence/19/key diff --git a/puzzles/sequence/2/index.mdwn b/packages/sequence/2/index.mdwn similarity index 100% rename from puzzles/sequence/2/index.mdwn rename to packages/sequence/2/index.mdwn diff --git a/puzzles/sequence/2/key b/packages/sequence/2/key similarity index 100% rename from puzzles/sequence/2/key rename to packages/sequence/2/key diff --git a/puzzles/sequence/200/index.mdwn b/packages/sequence/200/index.mdwn similarity index 100% rename from puzzles/sequence/200/index.mdwn rename to packages/sequence/200/index.mdwn diff --git a/puzzles/sequence/200/key b/packages/sequence/200/key similarity index 100% rename from puzzles/sequence/200/key rename to packages/sequence/200/key diff --git a/puzzles/sequence/25/index.mdwn b/packages/sequence/25/index.mdwn similarity index 100% rename from puzzles/sequence/25/index.mdwn rename to packages/sequence/25/index.mdwn diff --git a/puzzles/sequence/25/key b/packages/sequence/25/key similarity index 100% rename from puzzles/sequence/25/key rename to packages/sequence/25/key diff --git a/puzzles/sequence/300/index.mdwn b/packages/sequence/300/index.mdwn similarity index 100% rename from puzzles/sequence/300/index.mdwn rename to packages/sequence/300/index.mdwn diff --git a/puzzles/sequence/300/key b/packages/sequence/300/key similarity index 100% rename from puzzles/sequence/300/key rename to packages/sequence/300/key diff --git a/puzzles/sequence/35/index.mdwn b/packages/sequence/35/index.mdwn similarity index 100% rename from puzzles/sequence/35/index.mdwn rename to packages/sequence/35/index.mdwn diff --git a/puzzles/sequence/35/key b/packages/sequence/35/key similarity index 100% rename from puzzles/sequence/35/key rename to packages/sequence/35/key diff --git a/puzzles/sequence/400/index.mdwn b/packages/sequence/400/index.mdwn similarity index 100% rename from puzzles/sequence/400/index.mdwn rename to packages/sequence/400/index.mdwn diff --git a/puzzles/sequence/400/key b/packages/sequence/400/key similarity index 100% rename from puzzles/sequence/400/key rename to packages/sequence/400/key diff --git a/puzzles/sequence/450/index.mdwn b/packages/sequence/450/index.mdwn similarity index 100% rename from puzzles/sequence/450/index.mdwn rename to packages/sequence/450/index.mdwn diff --git a/puzzles/sequence/450/key b/packages/sequence/450/key similarity index 100% rename from puzzles/sequence/450/key rename to packages/sequence/450/key diff --git a/puzzles/sequence/50/index.mdwn b/packages/sequence/50/index.mdwn similarity index 100% rename from puzzles/sequence/50/index.mdwn rename to packages/sequence/50/index.mdwn diff --git a/puzzles/sequence/50/key b/packages/sequence/50/key similarity index 100% rename from puzzles/sequence/50/key rename to packages/sequence/50/key diff --git a/puzzles/sequence/600/index.mdwn b/packages/sequence/600/index.mdwn similarity index 100% rename from puzzles/sequence/600/index.mdwn rename to packages/sequence/600/index.mdwn diff --git a/puzzles/sequence/600/key b/packages/sequence/600/key similarity index 100% rename from puzzles/sequence/600/key rename to packages/sequence/600/key diff --git a/puzzles/sequence/700/index.mdwn b/packages/sequence/700/index.mdwn similarity index 100% rename from puzzles/sequence/700/index.mdwn rename to packages/sequence/700/index.mdwn diff --git a/puzzles/sequence/700/key b/packages/sequence/700/key similarity index 100% rename from puzzles/sequence/700/key rename to packages/sequence/700/key diff --git a/puzzles/sequence/8/index.mdwn b/packages/sequence/8/index.mdwn similarity index 100% rename from puzzles/sequence/8/index.mdwn rename to packages/sequence/8/index.mdwn diff --git a/puzzles/sequence/8/key b/packages/sequence/8/key similarity index 100% rename from puzzles/sequence/8/key rename to packages/sequence/8/key diff --git a/packages/sequence/sequence.mk b/packages/sequence/sequence.mk new file mode 100644 index 0000000..e2ef642 --- /dev/null +++ b/packages/sequence/sequence.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, sequence)) diff --git a/puzzles/sequence/summary.txt b/packages/sequence/summary.txt similarity index 100% rename from puzzles/sequence/summary.txt rename to packages/sequence/summary.txt diff --git a/puzzles/skynet/100/index.mdwn b/packages/skynet/100/index.mdwn similarity index 100% rename from puzzles/skynet/100/index.mdwn rename to packages/skynet/100/index.mdwn diff --git a/puzzles/skynet/100/key b/packages/skynet/100/key similarity index 100% rename from puzzles/skynet/100/key rename to packages/skynet/100/key diff --git a/puzzles/skynet/100/malware.zip b/packages/skynet/100/malware.zip similarity index 100% rename from puzzles/skynet/100/malware.zip rename to packages/skynet/100/malware.zip diff --git a/puzzles/skynet/102/index.mdwn b/packages/skynet/102/index.mdwn similarity index 100% rename from puzzles/skynet/102/index.mdwn rename to packages/skynet/102/index.mdwn diff --git a/puzzles/skynet/102/key b/packages/skynet/102/key similarity index 100% rename from puzzles/skynet/102/key rename to packages/skynet/102/key diff --git a/puzzles/skynet/102/malware.zip b/packages/skynet/102/malware.zip similarity index 100% rename from puzzles/skynet/102/malware.zip rename to packages/skynet/102/malware.zip diff --git a/puzzles/skynet/200/index.mdwn b/packages/skynet/200/index.mdwn similarity index 100% rename from puzzles/skynet/200/index.mdwn rename to packages/skynet/200/index.mdwn diff --git a/puzzles/skynet/200/key b/packages/skynet/200/key similarity index 100% rename from puzzles/skynet/200/key rename to packages/skynet/200/key diff --git a/puzzles/skynet/200/malware.zip b/packages/skynet/200/malware.zip similarity index 100% rename from puzzles/skynet/200/malware.zip rename to packages/skynet/200/malware.zip diff --git a/puzzles/skynet/202/index.mdwn b/packages/skynet/202/index.mdwn similarity index 100% rename from puzzles/skynet/202/index.mdwn rename to packages/skynet/202/index.mdwn diff --git a/puzzles/skynet/202/key b/packages/skynet/202/key similarity index 100% rename from puzzles/skynet/202/key rename to packages/skynet/202/key diff --git a/puzzles/skynet/202/malware.zip b/packages/skynet/202/malware.zip similarity index 100% rename from puzzles/skynet/202/malware.zip rename to packages/skynet/202/malware.zip diff --git a/puzzles/skynet/203/index.mdwn b/packages/skynet/203/index.mdwn similarity index 100% rename from puzzles/skynet/203/index.mdwn rename to packages/skynet/203/index.mdwn diff --git a/puzzles/skynet/203/key b/packages/skynet/203/key similarity index 100% rename from puzzles/skynet/203/key rename to packages/skynet/203/key diff --git a/puzzles/skynet/203/malware.zip b/packages/skynet/203/malware.zip similarity index 100% rename from puzzles/skynet/203/malware.zip rename to packages/skynet/203/malware.zip diff --git a/puzzles/skynet/300/index.mdwn b/packages/skynet/300/index.mdwn similarity index 100% rename from puzzles/skynet/300/index.mdwn rename to packages/skynet/300/index.mdwn diff --git a/puzzles/skynet/300/key b/packages/skynet/300/key similarity index 100% rename from puzzles/skynet/300/key rename to packages/skynet/300/key diff --git a/puzzles/skynet/300/malware.zip b/packages/skynet/300/malware.zip similarity index 100% rename from puzzles/skynet/300/malware.zip rename to packages/skynet/300/malware.zip diff --git a/puzzles/skynet/301/index.mdwn b/packages/skynet/301/index.mdwn similarity index 100% rename from puzzles/skynet/301/index.mdwn rename to packages/skynet/301/index.mdwn diff --git a/puzzles/skynet/301/key b/packages/skynet/301/key similarity index 100% rename from puzzles/skynet/301/key rename to packages/skynet/301/key diff --git a/puzzles/skynet/301/malware.zip b/packages/skynet/301/malware.zip similarity index 100% rename from puzzles/skynet/301/malware.zip rename to packages/skynet/301/malware.zip diff --git a/puzzles/skynet/302/index.mdwn b/packages/skynet/302/index.mdwn similarity index 100% rename from puzzles/skynet/302/index.mdwn rename to packages/skynet/302/index.mdwn diff --git a/puzzles/skynet/302/key b/packages/skynet/302/key similarity index 100% rename from puzzles/skynet/302/key rename to packages/skynet/302/key diff --git a/puzzles/skynet/302/malware.zip b/packages/skynet/302/malware.zip similarity index 100% rename from puzzles/skynet/302/malware.zip rename to packages/skynet/302/malware.zip diff --git a/puzzles/skynet/400/index.mdwn b/packages/skynet/400/index.mdwn similarity index 100% rename from puzzles/skynet/400/index.mdwn rename to packages/skynet/400/index.mdwn diff --git a/puzzles/skynet/400/key b/packages/skynet/400/key similarity index 100% rename from puzzles/skynet/400/key rename to packages/skynet/400/key diff --git a/puzzles/skynet/400/malware.zip b/packages/skynet/400/malware.zip similarity index 100% rename from puzzles/skynet/400/malware.zip rename to packages/skynet/400/malware.zip diff --git a/puzzles/skynet/401/index.mdwn b/packages/skynet/401/index.mdwn similarity index 100% rename from puzzles/skynet/401/index.mdwn rename to packages/skynet/401/index.mdwn diff --git a/puzzles/skynet/401/key b/packages/skynet/401/key similarity index 100% rename from puzzles/skynet/401/key rename to packages/skynet/401/key diff --git a/puzzles/skynet/401/malware.zip b/packages/skynet/401/malware.zip similarity index 100% rename from puzzles/skynet/401/malware.zip rename to packages/skynet/401/malware.zip diff --git a/puzzles/skynet/500/index.mdwn b/packages/skynet/500/index.mdwn similarity index 100% rename from puzzles/skynet/500/index.mdwn rename to packages/skynet/500/index.mdwn diff --git a/puzzles/skynet/500/key b/packages/skynet/500/key similarity index 100% rename from puzzles/skynet/500/key rename to packages/skynet/500/key diff --git a/puzzles/skynet/500/laststage-unpacker.exe b/packages/skynet/500/laststage-unpacker.exe similarity index 100% rename from puzzles/skynet/500/laststage-unpacker.exe rename to packages/skynet/500/laststage-unpacker.exe diff --git a/puzzles/skynet/500/malware.zip b/packages/skynet/500/malware.zip similarity index 100% rename from puzzles/skynet/500/malware.zip rename to packages/skynet/500/malware.zip diff --git a/puzzles/skynet/501/index.mdwn b/packages/skynet/501/index.mdwn similarity index 100% rename from puzzles/skynet/501/index.mdwn rename to packages/skynet/501/index.mdwn diff --git a/puzzles/skynet/501/key b/packages/skynet/501/key similarity index 100% rename from puzzles/skynet/501/key rename to packages/skynet/501/key diff --git a/puzzles/skynet/501/laststage-unpacker.exe b/packages/skynet/501/laststage-unpacker.exe similarity index 100% rename from puzzles/skynet/501/laststage-unpacker.exe rename to packages/skynet/501/laststage-unpacker.exe diff --git a/puzzles/skynet/501/malware.zip b/packages/skynet/501/malware.zip similarity index 100% rename from puzzles/skynet/501/malware.zip rename to packages/skynet/501/malware.zip diff --git a/packages/skynet/skynet.mk b/packages/skynet/skynet.mk new file mode 100644 index 0000000..3ee30db --- /dev/null +++ b/packages/skynet/skynet.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, skynet)) diff --git a/puzzles/skynet/summary.txt b/packages/skynet/summary.txt similarity index 100% rename from puzzles/skynet/summary.txt rename to packages/skynet/summary.txt diff --git a/puzzles/steg/1/,index.gif b/packages/steg/1/,index.gif similarity index 100% rename from puzzles/steg/1/,index.gif rename to packages/steg/1/,index.gif diff --git a/puzzles/steg/1/index.mdwn b/packages/steg/1/index.mdwn similarity index 100% rename from puzzles/steg/1/index.mdwn rename to packages/steg/1/index.mdwn diff --git a/puzzles/steg/1/key b/packages/steg/1/key similarity index 100% rename from puzzles/steg/1/key rename to packages/steg/1/key diff --git a/puzzles/steg/10/Makefile b/packages/steg/10/Makefile similarity index 100% rename from puzzles/steg/10/Makefile rename to packages/steg/10/Makefile diff --git a/puzzles/steg/10/key b/packages/steg/10/key similarity index 100% rename from puzzles/steg/10/key rename to packages/steg/10/key diff --git a/puzzles/steg/10/src.jpg b/packages/steg/10/src.jpg similarity index 100% rename from puzzles/steg/10/src.jpg rename to packages/steg/10/src.jpg diff --git a/puzzles/steg/10/text.txt b/packages/steg/10/text.txt similarity index 100% rename from puzzles/steg/10/text.txt rename to packages/steg/10/text.txt diff --git a/puzzles/steg/100/Makefile b/packages/steg/100/Makefile similarity index 100% rename from puzzles/steg/100/Makefile rename to packages/steg/100/Makefile diff --git a/puzzles/steg/100/encode b/packages/steg/100/encode similarity index 100% rename from puzzles/steg/100/encode rename to packages/steg/100/encode diff --git a/puzzles/steg/100/image.cmds b/packages/steg/100/image.cmds similarity index 100% rename from puzzles/steg/100/image.cmds rename to packages/steg/100/image.cmds diff --git a/puzzles/steg/100/image.exv b/packages/steg/100/image.exv similarity index 100% rename from puzzles/steg/100/image.exv rename to packages/steg/100/image.exv diff --git a/puzzles/steg/100/key b/packages/steg/100/key similarity index 100% rename from puzzles/steg/100/key rename to packages/steg/100/key diff --git a/puzzles/steg/100/pristine/ww0207-43.jpg b/packages/steg/100/pristine/ww0207-43.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0207-43.jpg rename to packages/steg/100/pristine/ww0207-43.jpg diff --git a/puzzles/steg/100/pristine/ww0207-45.jpg b/packages/steg/100/pristine/ww0207-45.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0207-45.jpg rename to packages/steg/100/pristine/ww0207-45.jpg diff --git a/puzzles/steg/100/pristine/ww0207-90.jpg b/packages/steg/100/pristine/ww0207-90.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0207-90.jpg rename to packages/steg/100/pristine/ww0207-90.jpg diff --git a/puzzles/steg/100/pristine/ww0870-09.jpg b/packages/steg/100/pristine/ww0870-09.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0870-09.jpg rename to packages/steg/100/pristine/ww0870-09.jpg diff --git a/puzzles/steg/100/pristine/ww0870-11.jpg b/packages/steg/100/pristine/ww0870-11.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0870-11.jpg rename to packages/steg/100/pristine/ww0870-11.jpg diff --git a/puzzles/steg/100/pristine/ww0870-14.jpg b/packages/steg/100/pristine/ww0870-14.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww0870-14.jpg rename to packages/steg/100/pristine/ww0870-14.jpg diff --git a/puzzles/steg/100/pristine/ww1645-22.jpg b/packages/steg/100/pristine/ww1645-22.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-22.jpg rename to packages/steg/100/pristine/ww1645-22.jpg diff --git a/puzzles/steg/100/pristine/ww1645-43.jpg b/packages/steg/100/pristine/ww1645-43.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-43.jpg rename to packages/steg/100/pristine/ww1645-43.jpg diff --git a/puzzles/steg/100/pristine/ww1645-44.jpg b/packages/steg/100/pristine/ww1645-44.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-44.jpg rename to packages/steg/100/pristine/ww1645-44.jpg diff --git a/puzzles/steg/100/pristine/ww1645-52.jpg b/packages/steg/100/pristine/ww1645-52.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-52.jpg rename to packages/steg/100/pristine/ww1645-52.jpg diff --git a/puzzles/steg/100/pristine/ww1645-53.jpg b/packages/steg/100/pristine/ww1645-53.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-53.jpg rename to packages/steg/100/pristine/ww1645-53.jpg diff --git a/puzzles/steg/100/pristine/ww1645-55.jpg b/packages/steg/100/pristine/ww1645-55.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1645-55.jpg rename to packages/steg/100/pristine/ww1645-55.jpg diff --git a/puzzles/steg/100/pristine/ww1646-66.jpg b/packages/steg/100/pristine/ww1646-66.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1646-66.jpg rename to packages/steg/100/pristine/ww1646-66.jpg diff --git a/puzzles/steg/100/pristine/ww1646-67.jpg b/packages/steg/100/pristine/ww1646-67.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1646-67.jpg rename to packages/steg/100/pristine/ww1646-67.jpg diff --git a/puzzles/steg/100/pristine/ww1646-69.jpg b/packages/steg/100/pristine/ww1646-69.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1646-69.jpg rename to packages/steg/100/pristine/ww1646-69.jpg diff --git a/puzzles/steg/100/pristine/ww1646-70.jpg b/packages/steg/100/pristine/ww1646-70.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1646-70.jpg rename to packages/steg/100/pristine/ww1646-70.jpg diff --git a/puzzles/steg/100/pristine/ww1646-78.jpg b/packages/steg/100/pristine/ww1646-78.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1646-78.jpg rename to packages/steg/100/pristine/ww1646-78.jpg diff --git a/puzzles/steg/100/pristine/ww1647-37.jpg b/packages/steg/100/pristine/ww1647-37.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1647-37.jpg rename to packages/steg/100/pristine/ww1647-37.jpg diff --git a/puzzles/steg/100/pristine/ww1647-75.jpg b/packages/steg/100/pristine/ww1647-75.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1647-75.jpg rename to packages/steg/100/pristine/ww1647-75.jpg diff --git a/puzzles/steg/100/pristine/ww1647-85.jpg b/packages/steg/100/pristine/ww1647-85.jpg similarity index 100% rename from puzzles/steg/100/pristine/ww1647-85.jpg rename to packages/steg/100/pristine/ww1647-85.jpg diff --git a/puzzles/steg/15/Makefile b/packages/steg/15/Makefile similarity index 100% rename from puzzles/steg/15/Makefile rename to packages/steg/15/Makefile diff --git a/puzzles/steg/15/key b/packages/steg/15/key similarity index 100% rename from puzzles/steg/15/key rename to packages/steg/15/key diff --git a/puzzles/steg/15/src.jpg b/packages/steg/15/src.jpg similarity index 100% rename from puzzles/steg/15/src.jpg rename to packages/steg/15/src.jpg diff --git a/puzzles/steg/15/text.txt b/packages/steg/15/text.txt similarity index 100% rename from puzzles/steg/15/text.txt rename to packages/steg/15/text.txt diff --git a/puzzles/steg/2/key b/packages/steg/2/key similarity index 100% rename from puzzles/steg/2/key rename to packages/steg/2/key diff --git a/puzzles/steg/2/test.docx b/packages/steg/2/test.docx similarity index 100% rename from puzzles/steg/2/test.docx rename to packages/steg/2/test.docx diff --git a/puzzles/steg/20/Makefile b/packages/steg/20/Makefile similarity index 100% rename from puzzles/steg/20/Makefile rename to packages/steg/20/Makefile diff --git a/puzzles/steg/20/key b/packages/steg/20/key similarity index 100% rename from puzzles/steg/20/key rename to packages/steg/20/key diff --git a/puzzles/steg/20/src.jpg b/packages/steg/20/src.jpg similarity index 100% rename from puzzles/steg/20/src.jpg rename to packages/steg/20/src.jpg diff --git a/puzzles/steg/20/text.txt b/packages/steg/20/text.txt similarity index 100% rename from puzzles/steg/20/text.txt rename to packages/steg/20/text.txt diff --git a/puzzles/steg/200/Makefile b/packages/steg/200/Makefile similarity index 100% rename from puzzles/steg/200/Makefile rename to packages/steg/200/Makefile diff --git a/puzzles/steg/200/encode b/packages/steg/200/encode similarity index 100% rename from puzzles/steg/200/encode rename to packages/steg/200/encode diff --git a/puzzles/steg/200/key b/packages/steg/200/key similarity index 100% rename from puzzles/steg/200/key rename to packages/steg/200/key diff --git a/puzzles/steg/200/text.txt b/packages/steg/200/text.txt similarity index 100% rename from puzzles/steg/200/text.txt rename to packages/steg/200/text.txt diff --git a/puzzles/steg/3/key b/packages/steg/3/key similarity index 100% rename from puzzles/steg/3/key rename to packages/steg/3/key diff --git a/puzzles/steg/3/test2.docx b/packages/steg/3/test2.docx similarity index 100% rename from puzzles/steg/3/test2.docx rename to packages/steg/3/test2.docx diff --git a/puzzles/steg/30/Makefile b/packages/steg/30/Makefile similarity index 100% rename from puzzles/steg/30/Makefile rename to packages/steg/30/Makefile diff --git a/puzzles/steg/30/key b/packages/steg/30/key similarity index 100% rename from puzzles/steg/30/key rename to packages/steg/30/key diff --git a/puzzles/steg/30/src.mp3 b/packages/steg/30/src.mp3 similarity index 100% rename from puzzles/steg/30/src.mp3 rename to packages/steg/30/src.mp3 diff --git a/puzzles/steg/30/text.txt b/packages/steg/30/text.txt similarity index 100% rename from puzzles/steg/30/text.txt rename to packages/steg/30/text.txt diff --git a/puzzles/steg/40/Makefile b/packages/steg/40/Makefile similarity index 100% rename from puzzles/steg/40/Makefile rename to packages/steg/40/Makefile diff --git a/puzzles/steg/40/encode b/packages/steg/40/encode similarity index 100% rename from puzzles/steg/40/encode rename to packages/steg/40/encode diff --git a/puzzles/steg/40/key b/packages/steg/40/key similarity index 100% rename from puzzles/steg/40/key rename to packages/steg/40/key diff --git a/puzzles/steg/40/lena.png b/packages/steg/40/lena.png similarity index 100% rename from puzzles/steg/40/lena.png rename to packages/steg/40/lena.png diff --git a/puzzles/steg/40/text.txt b/packages/steg/40/text.txt similarity index 100% rename from puzzles/steg/40/text.txt rename to packages/steg/40/text.txt diff --git a/packages/steg/steg.mk b/packages/steg/steg.mk new file mode 100644 index 0000000..243f852 --- /dev/null +++ b/packages/steg/steg.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, steg)) diff --git a/puzzles/steg/summary.txt b/packages/steg/summary.txt similarity index 100% rename from puzzles/steg/summary.txt rename to packages/steg/summary.txt diff --git a/tokens/service/tokens/log/run b/packages/tokens/service/tokens/log/run similarity index 100% rename from tokens/service/tokens/log/run rename to packages/tokens/service/tokens/log/run diff --git a/tokens/service/tokens/run b/packages/tokens/service/tokens/run similarity index 100% rename from tokens/service/tokens/run rename to packages/tokens/service/tokens/run diff --git a/tokens/service/tokens/tokens b/packages/tokens/service/tokens/tokens similarity index 100% rename from tokens/service/tokens/tokens rename to packages/tokens/service/tokens/tokens diff --git a/tokens/setup b/packages/tokens/setup similarity index 100% rename from tokens/setup rename to packages/tokens/setup diff --git a/tokens/src/Makefile b/packages/tokens/src/Makefile similarity index 100% rename from tokens/src/Makefile rename to packages/tokens/src/Makefile diff --git a/tokens/src/arc4-main.c b/packages/tokens/src/arc4-main.c similarity index 100% rename from tokens/src/arc4-main.c rename to packages/tokens/src/arc4-main.c diff --git a/packages/tokens/src/arc4.c b/packages/tokens/src/arc4.c new file mode 120000 index 0000000..0c6a48f --- /dev/null +++ b/packages/tokens/src/arc4.c @@ -0,0 +1 @@ +../../../include/arc4.c \ No newline at end of file diff --git a/packages/tokens/src/arc4.h b/packages/tokens/src/arc4.h new file mode 120000 index 0000000..d102bb2 --- /dev/null +++ b/packages/tokens/src/arc4.h @@ -0,0 +1 @@ +../../../include/arc4.h \ No newline at end of file diff --git a/tokens/src/tokencli.c b/packages/tokens/src/tokencli.c similarity index 100% rename from tokens/src/tokencli.c rename to packages/tokens/src/tokencli.c diff --git a/packages/tokens/tokens.mk b/packages/tokens/tokens.mk new file mode 100644 index 0000000..ee2cecc --- /dev/null +++ b/packages/tokens/tokens.mk @@ -0,0 +1,20 @@ +TOKENS_PKGDIR = $(BUILD)/tokens + +tokens-install: tokens-build + mkdir -p $(TOKENS_PKGDIR)/bin/ + + $(call COPYTREE, packages/tokens/service, $(TOKENS_PKGDIR)/service) + + cp packages/tokens/setup $(TOKENS_PKGDIR)/ + + cp packages/tokens/src/tokencli $(TOKENS_PKGDIR)/bin/ + cp packages/tokens/src/arc4 $(TOKENS_PKGDIR)/bin/ + +tokens-clean: + rm -rf $(TOKENS_PKGDIR) + $(MAKE) -C packages/tokens/src clean + +tokens-build: + $(MAKE) -C packages/tokens/src build + +PACKAGES += tokens diff --git a/puzzles/webapp/10/,binary.png b/packages/webapp/10/,binary.png similarity index 100% rename from puzzles/webapp/10/,binary.png rename to packages/webapp/10/,binary.png diff --git a/puzzles/webapp/10/,ctf.css b/packages/webapp/10/,ctf.css similarity index 100% rename from puzzles/webapp/10/,ctf.css rename to packages/webapp/10/,ctf.css diff --git a/puzzles/webapp/10/1.cgi b/packages/webapp/10/1.cgi similarity index 100% rename from puzzles/webapp/10/1.cgi rename to packages/webapp/10/1.cgi diff --git a/puzzles/webapp/10/key b/packages/webapp/10/key similarity index 100% rename from puzzles/webapp/10/key rename to packages/webapp/10/key diff --git a/puzzles/webapp/20/,binary.png b/packages/webapp/20/,binary.png similarity index 100% rename from puzzles/webapp/20/,binary.png rename to packages/webapp/20/,binary.png diff --git a/puzzles/webapp/20/,ctf.css b/packages/webapp/20/,ctf.css similarity index 100% rename from puzzles/webapp/20/,ctf.css rename to packages/webapp/20/,ctf.css diff --git a/puzzles/webapp/20/2.cgi b/packages/webapp/20/2.cgi similarity index 100% rename from puzzles/webapp/20/2.cgi rename to packages/webapp/20/2.cgi diff --git a/puzzles/webapp/20/key b/packages/webapp/20/key similarity index 100% rename from puzzles/webapp/20/key rename to packages/webapp/20/key diff --git a/puzzles/webapp/30/,binary.png b/packages/webapp/30/,binary.png similarity index 100% rename from puzzles/webapp/30/,binary.png rename to packages/webapp/30/,binary.png diff --git a/puzzles/webapp/30/,ctf.css b/packages/webapp/30/,ctf.css similarity index 100% rename from puzzles/webapp/30/,ctf.css rename to packages/webapp/30/,ctf.css diff --git a/puzzles/webapp/30/3.cgi b/packages/webapp/30/3.cgi similarity index 100% rename from puzzles/webapp/30/3.cgi rename to packages/webapp/30/3.cgi diff --git a/puzzles/webapp/30/key b/packages/webapp/30/key similarity index 100% rename from puzzles/webapp/30/key rename to packages/webapp/30/key diff --git a/puzzles/webapp/summary.txt b/packages/webapp/summary.txt similarity index 100% rename from puzzles/webapp/summary.txt rename to packages/webapp/summary.txt diff --git a/packages/webapp/webapp.mk b/packages/webapp/webapp.mk new file mode 100644 index 0000000..131d8eb --- /dev/null +++ b/packages/webapp/webapp.mk @@ -0,0 +1 @@ +$(eval $(call STANDARD_PUZZLE, webapp)) diff --git a/printf/printf.mk b/printf/printf.mk deleted file mode 100644 index 52c2b69..0000000 --- a/printf/printf.mk +++ /dev/null @@ -1,21 +0,0 @@ -PRINTF_PKGDIR = build/printf -PRINTF_PACKAGE = printf.pkg - -printf-install: printf-build - mkdir -p $(PRINTF_PKGDIR) - - mkdir -p $(PRINTF_PKGDIR)/bin/ - $(MAKE) -C printf/src install DESTDIR=$(CURDIR)/$(PRINTF_PKGDIR) - - $(call COPYTREE, printf/tokens, $(PRINTF_PKGDIR)/tokens) - - $(call COPYTREE, printf/service, $(PRINTF_PKGDIR)/service) - -printf-clean: - rm -rf $(PRINTF_PKGDIR) $(PRINTF_PACKAGE) - $(MAKE) -C printf/src clean - -printf-build: - $(MAKE) -C printf/src build - -PACKAGES += printf diff --git a/printf/src/token.c b/printf/src/token.c deleted file mode 120000 index 8c6738e..0000000 --- a/printf/src/token.c +++ /dev/null @@ -1 +0,0 @@ -../../common/token.c \ No newline at end of file diff --git a/printf/src/token.h b/printf/src/token.h deleted file mode 120000 index 25f916f..0000000 --- a/printf/src/token.h +++ /dev/null @@ -1 +0,0 @@ -../../common/token.h \ No newline at end of file diff --git a/puzzles/puzzles.mk b/puzzles/puzzles.mk deleted file mode 100644 index 249bd99..0000000 --- a/puzzles/puzzles.mk +++ /dev/null @@ -1,24 +0,0 @@ -PUZZLES += basemath bletchley codebreaking compaq crypto -PUZZLES += forensics hackme net-re sequence skynet webapp -PUZZLES += steg - -PUZZLES_SUBMAKEFILES = $(wildcard puzzles/*/*/Makefile) -PUZZLES_SUBCLEANS = $(patsubst %/Makefile, %/clean, $(PUZZLES_SUBMAKEFILES)) - -install: $(patsubst %, puzzles/%-install, $(PUZZLES)) -puzzles/%-install: - mkdir -p build/$* - puzzles/mkpuzzles puzzles/$* build/$* - touch $@ -%.pkg: puzzles/%-install - mksquashfs build/$* $*.pkg -all-root -noappend - -clean: puzzles-clean -clean: $(patsubst %, puzzles/%-clean, $(PUZZLES)) -puzzles-clean: $(PUZZLES_SUBCLEANS) $(patsubst %, puzzles/%-clean, $(PUZZLES)) -puzzles/%/clean: - $(MAKE) -C $(@D) clean -puzzles/%-clean: $(PUZZLES_SUBCLEANS) - rm -rf build/$* puzzles/$*-install $*.pkg - -packages: $(addsuffix .pkg, $(PUZZLES)) diff --git a/pwnables/pwnables.mk b/pwnables/pwnables.mk deleted file mode 100644 index bbe25e4..0000000 --- a/pwnables/pwnables.mk +++ /dev/null @@ -1,21 +0,0 @@ -PWNABLES_PKGDIR = build/pwnables -PWNABLES_PACKAGE = pwnables.pkg - -pwnables-install: pwnables-build - mkdir -p $(PWNABLES_PKGDIR) - - mkdir -p $(PWNABLES_PKGDIR)/bin/ - $(MAKE) -C pwnables/src install DESTDIR=$(CURDIR)/$(PWNABLES_PKGDIR) - - $(call COPYTREE, pwnables/tokens, $(PWNABLES_PKGDIR)/tokens) - - $(call COPYTREE, pwnables/service, $(PWNABLES_PKGDIR)/service) - -pwnables-clean: - rm -rf $(PWNABLES_PKGDIR) $(PWNABLES_PACKAGE) - $(MAKE) -C pwnables/src clean - -pwnables-build: - $(MAKE) -C pwnables/src build - -PACKAGES += pwnables diff --git a/pwnables/src/token.c b/pwnables/src/token.c deleted file mode 120000 index 8c6738e..0000000 --- a/pwnables/src/token.c +++ /dev/null @@ -1 +0,0 @@ -../../common/token.c \ No newline at end of file diff --git a/pwnables/src/token.h b/pwnables/src/token.h deleted file mode 120000 index 25f916f..0000000 --- a/pwnables/src/token.h +++ /dev/null @@ -1 +0,0 @@ -../../common/token.h \ No newline at end of file diff --git a/tokens/src/arc4.c b/tokens/src/arc4.c deleted file mode 120000 index 807950d..0000000 --- a/tokens/src/arc4.c +++ /dev/null @@ -1 +0,0 @@ -../../common/arc4.c \ No newline at end of file diff --git a/tokens/src/arc4.h b/tokens/src/arc4.h deleted file mode 120000 index 2d31392..0000000 --- a/tokens/src/arc4.h +++ /dev/null @@ -1 +0,0 @@ -../../common/arc4.h \ No newline at end of file diff --git a/tokens/tokens.mk b/tokens/tokens.mk deleted file mode 100644 index 732ffd2..0000000 --- a/tokens/tokens.mk +++ /dev/null @@ -1,21 +0,0 @@ -TOKENS_PKGDIR = build/tokens -TOKENS_PACKAGE = tokens.pkg - -tokens-install: tokens-build - mkdir -p $(TOKENS_PKGDIR)/bin/ - - $(call COPYTREE, tokens/service, $(TOKENS_PKGDIR)/service) - - cp tokens/setup $(TOKENS_PKGDIR)/ - - cp tokens/src/tokencli $(TOKENS_PKGDIR)/bin/ - cp tokens/src/arc4 $(TOKENS_PKGDIR)/bin/ - -tokens-clean: - rm -rf $(TOKENS_PKGDIR) $(TOKENS_PACKAGE) - $(MAKE) -C tokens/src clean - -tokens-build: - $(MAKE) -C tokens/src build - -PACKAGES += tokens