X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.glitch;h=1d301a9117c9c2cc72787102085ad83c78947256;hp=69d7b830076415ad4f3d02b8d7fba1dfeca3f0e0;hb=5ee19fee9dc2095ccb67fc2a86c53799ae47b403;hpb=b90b77172a80809a4fb1fb32260241a9e1a75b61

diff --git a/client/goodfet.glitch b/client/goodfet.glitch
index 69d7b83..1d301a9 100755
--- a/client/goodfet.glitch
+++ b/client/goodfet.glitch
@@ -19,6 +19,8 @@ if(len(sys.argv)==1):
     print "%s avr explore" % sys.argv[0];
     print "%s avr graph" % sys.argv[0];
     print "%s avr graphx11" % sys.argv[0];
+    print "%s avr points" % sys.argv[0];
+    print "%s avr npoints" % sys.argv[0];
     print """
 This populates a database, glitch.db, with a record of all attempted
 glitches.  Graphs can then be generated from the results, allowing
@@ -27,13 +29,31 @@ sequence for a new chip is as follows.
 
 On a sample chip for the same model as the target,
 1) Run 'goodfet $chip learn' in order to learn the glitching voltages.
-2) Run 'goodfet $chip explore' to find a time at which to glitch.
+2) Run 'goodfet $chip crunch' in order to precompute glitching ranges.
+3) Run 'goodfet $chip explore' to find a time at which to glitch.
 
 Then on a chip to be extracted,
 3) Run 'goodfet $chip exploit' to exploit a chip and recover its firmware."""
     sys.exit();
 
 
+if(sys.argv[2]=="graphx11"):
+    glitcher.graphx11();
+    exit();
+if(sys.argv[2]=="graph"):
+    glitcher.graph();
+    exit();
+if(sys.argv[2]=="points"):
+    glitcher.points();
+    exit();
+if(sys.argv[2]=="npoints"):
+    glitcher.npoints();
+    exit();
+
+if(sys.argv[2]=="crunch"):
+    glitcher.crunch();
+    exit();
+
 glitcher.setup(sys.argv[1]);
 
 if(sys.argv[2]=="learn"):
@@ -43,8 +63,3 @@ if(sys.argv[2]=="explore"):
 if(sys.argv[2]=="exploit"):
     print "Coming soon.";
 
-if(sys.argv[2]=="graphx11"):
-    glitcher.graphx11();
-
-if(sys.argv[2]=="graph"):
-    glitcher.graph();