[tor-commits] [ooni-probe/master] Add notes explaining defaults chosen if no commandline options are chosen, and

[art@xxxxxxxxxxxxxx]

commit a4254fd3e90e3960497be61d4abd4eaf34cdce73
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Thu Feb 28 01:53:25 2013 +0000

    Add notes explaining defaults chosen if no commandline options are chosen, and
    a note-to-self to explain to users that currently only one TLS/SSL context
    method can be chosen at a time.
    
     * TODO add support for looping through multiple TLS/SSL contexts.
---
 nettests/experimental/tls_handshake.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index 7f3c8ad..6474792 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -107,16 +107,19 @@ class TLSHandshakeTest(nettest.NetTestCase):
             if not ((options['host'] and options['port']) or options['file']):
                  sys.exit("Need --host and --port, or --file!")
 
+            ## xxx TODO there's nothing that tells the user they can only have
+            ##     one of the TLS/SSL methods at a time.
+
             ## set the SSL/TLS method to use:
             for method in ['ssl2', 'ssl3', 'tls1']:
                 if options[method]:
                     self.methods.append(method)
 
-            ## if we weren't given a file with a list of ciphersuites to use,
-            ## then use the firefox default list:
             if not options['ciphersuite']:
                 self.ciphers = firefox_ciphers
             else:
+                ## if we weren't given a file with a list of ciphersuites to
+                ## use, then use the firefox default list:
                 if os.path.isfile(options['ciphersuite']):
                     with open(options['ciphersuite']) as cipherfile:
                         for line in cipherfile.readlines():



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits