Fix some of the problems found at NSM

.gitignore

@@ -2,3 +2,5 @@
 *#
 *.pyc
 *.o
+bin/
+build/

doc/problems.txt

@@ -1,14 +1,4 @@
-* "net-re" dash tripping up category validation in puzzler
-* scores not preserved in /var/lib/ctf, wtf?
-* bletchley 150 no key
 * claim.cgi not exiting
 * someone managed to get a point in no category.  that broke the scoreboard.
-* ha ha, guess what this does if points.log already exists:
-    install -o root -m 0644 /dev/null /var/lib/ctf/points.log
-* scoreboard: teams aren't properly filling columns (make td have size)
-* sequence 700 no key
-* steg 20 not m4ing key
-* no "pointscli" binary
-* steg 200 totally screwed up
 * get LAUR for contest
-
+* steg point values

packages/mcp/mcp.mk

@@ -5,7 +5,7 @@ mcp-install: mcp-build
 
 	$(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/pointscli $(MCP_PKGDIR)/bin/
 	cp packages/mcp/src/tokencli $(MCP_PKGDIR)/bin/
 	cp packages/mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/
 

packages/mcp/src/claim.cgi.c

@@ -73,7 +73,6 @@ main(int argc, char *argv[])
     }
   }
 
-
   cgi_page("Point awarded", "<!-- success -->");
 
   return 0;

packages/mcp/src/common.c

@@ -70,6 +70,9 @@ read_char_stdin()
       if (inlen > POST_MAX) {
         inlen = POST_MAX;
       }
+      if (inlen < 0) {
+        inlen = 0;
+      }
     } else {
       inlen = 0;
     }

packages/packages.mk

@@ -7,11 +7,13 @@ endef
 
 define STANDARD_PUZZLE
 t=$(strip $1)
-$t-install:
+$t-install: $t-stdinstall
+$t-stdinstall:
 	mkdir -p $(BUILD)/$t
 	./mkpuzzles packages/$t $(BUILD)/$t
 
-$t-clean:
+$t-clean: $t-stdclean
+$t-stdclean:
 	rm -rf $(BUILD)/$t $(BIN)/$t.pkg
 
 PACKAGES += $t

packages/steg/20/Makefile

@@ -7,7 +7,8 @@ src.jpg:
 	wget -O src.jpg $(IMG)
 
 file.jpg: src.jpg
-	cat src.jpg text.txt > $@
+	cat src.jpg > $@
+	m4 -DKEY="$(shell cat key)" text.txt > $@
 
 clean:
 	rm -f file.jpg

packages/steg/200/text.txt

@@ -80,4 +80,4 @@ All these aforesaid customs and liberties which we have granted to be held in ou
 
 We, holding these aforesaid gifts and grants to be right and welcome, conceed and confirm them for ourselves and our heirs and by the terms of the present (letters) renew them, wishing and granting for ourselves and our heirs that the aforesaid charter is to be firmly and inviably observed in all and each of its articles in perpetuity, including any articles contained in the same charter which by chance have not to date been observed. In testimony of which we have had made these our letters patent. Witnessed by Edward our son, at Westminster on the twelfth day of October in the twenty-fifth year of our reign. (Chancery warranty by John of) Stowe.
 
-The key is "KEY".
+The key isn't here.  Keep looking.

packages/steg/steg.mk

@@ -1 +1,9 @@
 $(eval $(call STANDARD_PUZZLE, steg))
+
+STEG_SUBMAKES = $(wildcard packages/steg/*/Makefile)
+STEG_SUBCLEANS = $(patsubst %/Makefile, %/clean, $(STEG_SUBMAKES))
+
+steg-clean: $(STEG_SUBCLEANS)
+
+packages/steg/%/clean:
+	$(MAKE) -C $(@D) clean