commit 865ec32d230e18321df3ab006b8eb5fff747f9e0 Merge: df06507 4fdbd62 Author: Arturo Filastò art@fuffa.org Date: Tue Apr 30 15:01:06 2013 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: (61 commits) Fix tls_handshake input processing Fix import conflict Set self.input to self.host if no inputFile, and update several log messages. Reformat docstrings for several HandshakeTest functions to Sphinx format. Rename HandshakeTest.test_tlsv1_handshake() to HandshakeTest.test_handshake(). Cleanup docstrings for getX509Name() and getPublicKey() functions. Add Sphinx docstring for getPeerCert() function. Move to call IPAddress explicitly from ipaddr.IPAdress. Add self.host to the inputProcessor(). If no ciphersuite list is provided, explain that we're using firefox's. Fix bug where conflicting SSL context choices was not explained to the user. Fix #8440, set the self.host attribute when given the --host option. Create a host attribute for storing the --host option, and set self.ciphers. Make 'context' be a class-level attribute and give it a Sphinx :attr: docstring. Bump the version number on HandshakeTest, and rename the usageOptions attribute. Rename TLSHandshakeTest to HandshakeTest, since it's not only TLS. Remove UsageOptions to HandshakeOptions, and make arg help strings more informative. Fix HostUnreachable docstring to have proper Sphinx formatting. Add dictionary of pre-defined error messages to SSLContextError. Update docstring for SSLContextError. ...

.gitignore | 2 + nettests/experimental/tls_handshake.py | 794 ++++++++++++++++++++++++++++++++ ooni/utils/txscapy.py | 1 + 3 files changed, 797 insertions(+), 0 deletions(-)