Changeset 115 for trunk

Timestamp:

10/06/16 21:10:15 (8 years ago)

Author:

tim

Message:

256 color now default

Location:

trunk

Files:

• bin/bletchley-analyze (modified) (3 diffs)
• lib/bletchley/ssltls.py (modified) (2 diffs)

trunk/bin/bletchley-analyze

@@ -44 +44 @@
 parser.add_argument('-p', dest='output_lines', type=int, default=10,
                     help='Number of lines of input to display in decoded form.')
+parser.add_argument('-C', action='store_const', const=True, default=False,
+                    help='Use mono output for decoded highlights.')
 parser.add_argument('-c', action='store_const', const=True, default=False,
-                    help='Use color output for decoded highlights.')
-parser.add_argument('-c256', action='store_const', const=True, default=False,
-                    help='Use 256 color output for decoded highlights.')
+                    help='Use 8 color output for decoded highlights.')
+parser.add_argument('-c256', action='store_const', const=True, default=True,
+                    help='Use 256 color output for decoded highlights. (default)')
 options = parser.parse_args()
 
@@ -66 +68 @@
         return s
 
-    if options.c256:
-        fg = code%216+16
-        bg = (code^0xffffffff)%216+16
-        return "\x1b[0;38;05;%d;48;05;%dm%s\x1b[0m" % (fg,bg,s)
+    if options.C:
+        return "\x1b[7m%s\x1b[0m" % s        
     elif options.c:
         fg = code%6+31
@@ -75 +75 @@
         return "\x1b[0;%d;%dm%s\x1b[0m" % (fg,bg,s)
     else:
-        return "\x1b[7m%s\x1b[0m" % s
+        fg = code%216+16
+        bg = (code^0xffffffff)%216+16
+        return "\x1b[0;38;05;%d;48;05;%dm%s\x1b[0m" % (fg,bg,s)
 
 

trunk/lib/bletchley/ssltls.py

@@ -45 +45 @@
     context = SSL.Context(method)
     context.set_verify(SSL.VERIFY_NONE, (lambda a,b,c,d,e: True))
+
     if key and len(certChain) > 0:
         context.use_privatekey(key)
@@ -54 +55 @@
 
 
-def startSSLTLS(sock, mode='client', handshake=SSL.TLSv1_METHOD, key=None, certChain=[]):
-    conn = SSL.Connection(createContext(handshake, key=key, certChain=certChain), sock)
+def startSSLTLS(sock, mode='client', handshake=SSL.TLSv1_METHOD, key=None, certChain=[], cipher_list=None):
+    '''
+    cipher_list example:  b'DH-DSS-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:DH-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DH-RSA-AES256-SHA256:DH-DSS-AES256-SHA256:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DH-RSA-AES256-SHA:DH-DSS-AES256-SHA:DHE-RSA-CAMELLIA256-SHA:DHE-DSS-CAMELLIA256-SHA:DH-RSA-CAMELLIA256-SHA:DH-DSS-CAMELLIA256-SHA:ADH-AES256-GCM-SHA384:ADH-AES256-SHA256:ADH-AES256-SHA:ADH-CAMELLIA256-SHA:DH-DSS-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DH-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-DSS-AES128-SHA256:DH-RSA-AES128-SHA256:DH-DSS-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:DH-RSA-AES128-SHA:DH-DSS-AES128-SHA:DHE-RSA-SEED-SHA:DHE-DSS-SEED-SHA:DH-RSA-SEED-SHA:DH-DSS-SEED-SHA:DHE-RSA-CAMELLIA128-SHA:DHE-DSS-CAMELLIA128-SHA:DH-RSA-CAMELLIA128-SHA:DH-DSS-CAMELLIA128-SHA:ADH-AES128-GCM-SHA256:ADH-AES128-SHA256:ADH-AES128-SHA:ADH-SEED-SHA:ADH-CAMELLIA128-SHA:ADH-RC4-MD5:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DH-RSA-DES-CBC3-SHA:DH-DSS-DES-CBC3-SHA:ADH-DES-CBC3-SHA'
+    '''
+    
+    context = createContext(handshake, key=key, certChain=certChain)
+    if cipher_list:
+        context.set_cipher_list(cipher_list)
+    #if not key and mode == 'server':
+    #context.set_options(OpenSSL.SSL.OP_SINGLE_DH_USE)
+    #context.set_options(OpenSSL.SSL.OP_EPHEMERAL_RSA)
+        
+    conn = SSL.Connection(context, sock)
     if mode == 'client':
         conn.set_connect_state()