Changeset 13 for bin/bletchley-analyze

Timestamp:

11/11/12 13:10:42 (12 years ago)

Author:

tmorgan

Message:

added block size and encoding chain options

File:

• bin/bletchley-analyze (modified) (4 diffs)

bin/bletchley-analyze

@@ -32 +32 @@
 parser.add_argument('input_file', nargs='?', default=None,
                     help='File containing encrypted blobs to analyze, one per line. Omit to read from stdin.')
+parser.add_argument('-e', dest='encoding_chain', type=str, default=None,
+                    help='Comma-separated sequence of formats used to encode the tokens, beginning with the last one applied. (default: auto-detect)')
+parser.add_argument('-b', dest='block_size', type=int, default=8,
+                    help='The block size displayed and used in highlighting (default: 8)')
 parser.add_argument('-p', dest='output_lines', type=int, default=10,
                     help='Number of lines of input to display in decoded form.')
@@ -76 +80 @@
         
         for i in range(0,len(hex),line_size):
-            line = '%.8X: ' % i
+            line = '%.4X: ' % i
 
             if len(hex[i:]) < line_size:
@@ -111 +115 @@
     return encoding,block_sizes
 
+specified_encodings = []
+if options.encoding_chain != None:
+    specified_encodings = options.encoding_chain.split(',')
 
 encoding_chain = []
@@ -118 +125 @@
     print('Beginning analysis after decoding by chain: %s' % ','.join(encoding_chain))
     encoding,block_sizes = analyze(blobs)
-    group_size = 4
-    if len(block_sizes) > 0 and min(block_sizes) in (8,16):
-        group_size = min(block_sizes)
+    if len(specified_encodings) > 0:
+        encoding = specified_encodings.pop(0)
+
 
     blobs_to_print = blobs[:options.output_lines]
     print('First %d Values:' % len(blobs_to_print))
 
-    printColoredHexDump(blobs_to_print, group_size)
+    printColoredHexDump(blobs_to_print, options.block_size)
 
     if encoding != None: