Changeset 34 for trunk

Timestamp:

02/11/13 16:27:42 (12 years ago)

Author:

tmorgan

Message:

added limited support for base64 blobs with inline newlines

File:

• trunk/lib/bletchley/blobtools.py (modified) (5 diffs)

trunk/lib/bletchley/blobtools.py

@@ -32 +32 @@
 class DataEncoding(object):
     charset = frozenset('')
+    extraneous_chars = ''
     dialect = None
     name = None
@@ -104 +105 @@
             self.pad = '='
         
+        if 'newline' in dialect:
+            self.extraneous_chars = '\r\n'
+
         self.charset = frozenset('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                                  +'abcdefghijklmnopqrstuvwxyz0123456789'
-                                 +self.c62+self.c63+self.pad)
+                                 +self.c62+self.c63+self.pad+self.extraneous_chars)
 
     def _guessPadLength(self, nopad_len):
@@ -115 +119 @@
 
     def extraTests(self, blob):
+        for c in self.extraneous_chars:
+            blob = blob.replace(c, '')
+
         nopad = blob.rstrip(self.pad)
         padlen_guess = self._guessPadLength(len(nopad))
@@ -129 +136 @@
 
     def decode(self, blob):
+        for c in self.extraneous_chars:
+            blob = blob.replace(c, '')
+
         if self.dialect.endswith('nopad'):
             if self.pad in blob:
@@ -292 +302 @@
     (base64Encoding, 'rfc3548', 200),
     (base64Encoding, 'rfc3548-nopad', 201),
+    (base64Encoding, 'rfc3548-newline', 202),
     (base64Encoding, 'filename', 210),
     (base64Encoding, 'filename-nopad', 211),