Update tlslite to 0.4.6.

third_party/tlslite/tlslite/integration/clienthelper.py

Index: third_party/tlslite/tlslite/integration/clienthelper.py
diff --git a/third_party/tlslite/tlslite/integration/clienthelper.py b/third_party/tlslite/tlslite/integration/clienthelper.py
index 48846ea3e6c8c54699820da1a89594fc5a229ad0..62e59616499587e377ac7c960afbac32e6645b8e 100644
--- a/third_party/tlslite/tlslite/integration/clienthelper.py
+++ b/third_party/tlslite/tlslite/integration/clienthelper.py
@@ -1,3 +1,9 @@
+# Authors: 
+#   Trevor Perrin
+#   Dimitris Moraitis - Anon ciphersuites
+#
+# See the LICENSE file for legal information regarding use of this file.
+
 """
 A helper class for using TLS Lite with stdlib clients
 (httplib, xmlrpclib, imaplib, poplib).
@@ -5,35 +11,30 @@ A helper class for using TLS Lite with stdlib clients
 
 from tlslite.checker import Checker
 
-class ClientHelper:
+class ClientHelper(object):
     """This is a helper class used to integrate TLS Lite with various
     TLS clients (e.g. poplib, smtplib, httplib, etc.)"""
 
     def __init__(self,
-              username=None, password=None, sharedKey=None,
+              username=None, password=None,
               certChain=None, privateKey=None,
-              cryptoID=None, protocol=None,
-              x509Fingerprint=None,
-              x509TrustList=None, x509CommonName=None,
-              settings = None):
+              checker=None,
+              settings = None, 
+              anon = False):
         """
         For client authentication, use one of these argument
         combinations:
          - username, password (SRP)
-         - username, sharedKey (shared-key)
          - certChain, privateKey (certificate)
 
         For server authentication, you can either rely on the
-        implicit mutual authentication performed by SRP or
-        shared-keys, or you can do certificate-based server
+        implicit mutual authentication performed by SRP,
+        or you can do certificate-based server
         authentication with one of these argument combinations:
-         - cryptoID[, protocol] (requires cryptoIDlib)
          - x509Fingerprint
-         - x509TrustList[, x509CommonName] (requires cryptlib_py)
 
         Certificate-based server authentication is compatible with
-        SRP or certificate-based client authentication.  It is
-        not compatible with shared-keys.
+        SRP or certificate-based client authentication.
 
         The constructor does not perform the TLS handshake itself, but
         simply stores these arguments for later.  The handshake is
@@ -44,56 +45,26 @@ class ClientHelper:
         exceptions might be raised.
 
         @type username: str
-        @param username: SRP or shared-key username.  Requires the
-        'password' or 'sharedKey' argument.
+        @param username: SRP username.  Requires the
+        'password' argument.
 
         @type password: str
         @param password: SRP password for mutual authentication.
         Requires the 'username' argument.
 
-        @type sharedKey: str
-        @param sharedKey: Shared key for mutual authentication.
-        Requires the 'username' argument.
-
-        @type certChain: L{tlslite.X509CertChain.X509CertChain} or
-        L{cryptoIDlib.CertChain.CertChain}
+        @type certChain: L{tlslite.x509certchain.X509CertChain}
         @param certChain: Certificate chain for client authentication.
-        Requires the 'privateKey' argument.  Excludes the SRP or
-        shared-key related arguments.
+        Requires the 'privateKey' argument.  Excludes the SRP arguments.
 
-        @type privateKey: L{tlslite.utils.RSAKey.RSAKey}
+        @type privateKey: L{tlslite.utils.rsakey.RSAKey}
         @param privateKey: Private key for client authentication.
-        Requires the 'certChain' argument.  Excludes the SRP or
-        shared-key related arguments.
-
-        @type cryptoID: str
-        @param cryptoID: cryptoID for server authentication.  Mutually
-        exclusive with the 'x509...' arguments.
-
-        @type protocol: str
-        @param protocol: cryptoID protocol URI for server
-        authentication.  Requires the 'cryptoID' argument.
-
-        @type x509Fingerprint: str
-        @param x509Fingerprint: Hex-encoded X.509 fingerprint for
-        server authentication.  Mutually exclusive with the 'cryptoID'
-        and 'x509TrustList' arguments.
-
-        @type x509TrustList: list of L{tlslite.X509.X509}
-        @param x509TrustList: A list of trusted root certificates.  The
-        other party must present a certificate chain which extends to
-        one of these root certificates.  The cryptlib_py module must be
-        installed to use this parameter.  Mutually exclusive with the
-        'cryptoID' and 'x509Fingerprint' arguments.
-
-        @type x509CommonName: str
-        @param x509CommonName: The end-entity certificate's 'CN' field
-        must match this value.  For a web server, this is typically a
-        server name such as 'www.amazon.com'.  Mutually exclusive with
-        the 'cryptoID' and 'x509Fingerprint' arguments.  Requires the
-        'x509TrustList' argument.
-
-        @type settings: L{tlslite.HandshakeSettings.HandshakeSettings}
+        Requires the 'certChain' argument.  Excludes the SRP arguments.
+
+        @type checker: L{tlslite.checker.Checker}
+        @param checker: Callable object called after handshaking to 
+        evaluate the connection and raise an Exception if necessary.
+
+        @type settings: L{tlslite.handshakesettings.HandshakeSettings}
         @param settings: Various settings which can be used to control
         the ciphersuites, certificate types, and SSL/TLS versions
         offered by the client.
@@ -101,44 +72,32 @@ class ClientHelper:
 
         self.username = None
         self.password = None
-        self.sharedKey = None
         self.certChain = None
         self.privateKey = None
         self.checker = None
+        self.anon = anon
 
         #SRP Authentication
         if username and password and not \
-                (sharedKey or certChain or privateKey):
+                (certChain or privateKey):
             self.username = username
             self.password = password
 
-        #Shared Key Authentication
-        elif username and sharedKey and not \
-                (password or certChain or privateKey):
-            self.username = username
-            self.sharedKey = sharedKey
-
         #Certificate Chain Authentication
         elif certChain and privateKey and not \
-                (username or password or sharedKey):
+                (username or password):
             self.certChain = certChain
             self.privateKey = privateKey
 
         #No Authentication
         elif not password and not username and not \
-                sharedKey and not certChain and not privateKey:
+                certChain and not privateKey:
             pass
 
         else:
             raise ValueError("Bad parameters")
 
-        #Authenticate the server based on its cryptoID or fingerprint
-        if sharedKey and (cryptoID or protocol or x509Fingerprint):
-            raise ValueError("Can't use shared keys with other forms of"\
-                             "authentication")
-
-        self.checker = Checker(cryptoID, protocol, x509Fingerprint,
-                               x509TrustList, x509CommonName)
+        self.checker = checker
         self.settings = settings
 
         self.tlsSession = None
@@ -150,14 +109,14 @@ class ClientHelper:
                                              checker=self.checker,
                                              settings=self.settings,
                                              session=self.tlsSession)
-        elif self.username and self.sharedKey:
-            tlsConnection.handshakeClientSharedKey(username=self.username,
-                                                   sharedKey=self.sharedKey,
-                                                   settings=self.settings)
+        elif self.anon:
+            tlsConnection.handshakeClientAnonymous(session=self.tlsSession,
+                                                settings=self.settings,
+                                                checker=self.checker)
         else:
             tlsConnection.handshakeClientCert(certChain=self.certChain,
                                               privateKey=self.privateKey,
                                               checker=self.checker,
                                               settings=self.settings,
                                               session=self.tlsSession)
-        self.tlsSession = tlsConnection.session
+        self.tlsSession = tlsConnection.session