commit 30fed64995cd63225c8856cb65124e9a93a190a1 Author: Isis Lovecruft <isis@torproject.org> Date: Mon Apr 22 00:43:40 2013 +0000 If no ciphersuite list is provided, explain that we're using firefox's. --- 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 89a9bd9..eab721c 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -170,12 +170,15 @@ class HandshakeTest(nettest.NetTestCase): elif options['ssl3']: self.context = SSL.Context(SSL.SSLv3_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 + log.msg('Using default Firefox ciphersuite list.') 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']): + log.msg('Using ciphersuite list from "%s"' + % options['ciphersuite']) with open(options['ciphersuite']) as cipherfile: for line in cipherfile.readlines(): self.ciphers.append(line.strip())