From 0c040c66fdaa0411c0a468f49d70a89601e46d67 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Sat, 5 Mar 2011 11:57:41 -0700
Subject: [PATCH] Fix for answers containing '\', fix port number for ssh

---
 mkpuzzles                         | 8 ++------
 packages/ctfbase/service/sshd/run | 4 ++--
 packages/skynet/501/key           | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/mkpuzzles b/mkpuzzles
index 1e42342..81dc5bc 100755
--- a/mkpuzzles
+++ b/mkpuzzles
@@ -98,9 +98,7 @@ for dn in $indir/[0-9]*; do
 
     # Append keys 
     if [ -f $dn/key ]; then
-        while read answer; do
-            [ -n "$answer" ] && echo $points $answer >> $uanswers
-        done < $dn/key
+        awk -v P=$points '/./ { printf("%d %s\n", P, $0); }' < $dn/key >> $uanswers
     else
         echo "$dn/key: No such file or directory" 1>&2
         exit 1
@@ -108,9 +106,7 @@ for dn in $indir/[0-9]*; do
 
     # Append summary
     if [ -f $dn/summary ]; then
-        while read line; do
-            echo $points $line >> $usummary
-        done < $dn/summary
+        awk -v P=$points '/./ { printf("%d %s\n", P, $0); }' < $dn/summary >> $usummary
     fi
 
     # Generate index now that we have a list of files
diff --git a/packages/ctfbase/service/sshd/run b/packages/ctfbase/service/sshd/run
index 8c10f2e..551c66d 100755
--- a/packages/ctfbase/service/sshd/run
+++ b/packages/ctfbase/service/sshd/run
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 exec 2>&1
-iptables -A INPUT -s 10.0.0.0/16 --proto tcp --dport 55 -j ACCEPT
-iptables -A INPUT --proto tcp --dport 55 -j REJECT
+iptables -A INPUT -s 10.0.0.0/16 --proto tcp --dport 22 -j ACCEPT
+iptables -A INPUT --proto tcp --dport 22 -j REJECT
 exec dropbear -r ./rsa.key -E -F
diff --git a/packages/skynet/501/key b/packages/skynet/501/key
index ea5431b..0c48c6d 100644
--- a/packages/skynet/501/key
+++ b/packages/skynet/501/key
@@ -1 +1 @@
- kdD
+kdD