Add TLS-SRP (RFC 5054) support

third_party/tlslite/scripts/tls.py

 #! python
 
 import sys
 import os
 import os.path
 import socket
 import thread
 import time
 import httplib
 import BaseHTTPServer
@@ skipping 73 matching lines @@
         connection = connect()
         connection.fault = fault
         try:
             connection.handshakeClientSRP("test", "password")
             print "  Good Fault %s" % (Fault.faultNames[fault])
         except TLSFaultError, e:
             print "  BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
             badFault = True
         connection.sock.close()
 
-    print "Test 5 - good SRP: unknown_srp_username idiom"
+    print "Test 5 - good SRP: unknown_psk_identity idiom"
     def srpCallback():
         return ("test", "password")
     connection = connect()
     connection.handshakeClientUnknown(srpCallback=srpCallback)
     connection.close()
     connection.sock.close()
 
     print "Test 6 - good SRP: with X.509 certificate"
     connection = connect()
     connection.handshakeClientSRP("test", "password")
@@ skipping 353 matching lines @@
     for fault in Fault.clientSrpFaults + Fault.genericFaults:
         connection = connect()
         connection.fault = fault
         try:
             connection.handshakeServer(verifierDB=verifierDB)
             assert()
         except:
             pass
         connection.sock.close()
 
-    print "Test 5 - good SRP: unknown_srp_username idiom"
+    print "Test 5 - good SRP: unknown_psk_identity idiom"
     connection = connect()
     connection.handshakeServer(verifierDB=verifierDB)
     connection.close()
     connection.sock.close()
 
     print "Test 6 - good SRP: with X.509 cert"
     x509Cert = X509().parse(open(os.path.join(dir, "serverX509Cert.pem")).read())
     x509Chain = X509CertChain([x509Cert])
     s = open(os.path.join(dir, "serverX509Key.pem")).read()
     x509Key = parsePEMKey(s, private=True)
@@ skipping 407 matching lines @@
                 if cmd == "clientsharedkey":
                     print "Bad sharedkey password"
                 else:
                     raise
             elif a.description == AlertDescription.user_canceled:
                 print str(a)
             else:
                 raise
             sys.exit()
         except TLSRemoteAlert, a:
-            if a.description == AlertDescription.unknown_srp_username:
+            if a.description == AlertDescription.unknown_psk_identity:
                 if cmd == "clientsrp":
                     print "Unknown username"
                 else:
                     raise
             elif a.description == AlertDescription.bad_record_mac:
                 if cmd == "clientsrp":
                     print "Bad username or password"
                 else:
                     raise
             elif a.description == AlertDescription.handshake_failure:
@@ skipping 113 matching lines @@
                 s = ""
                 while 1:
                     newS = connection.read()
                     if not newS:
                         break
                     s += newS
                     if s[-1]=='\n':
                         connection.write(s)
                         s = ""
             except TLSLocalAlert, a:
-                if a.description == AlertDescription.unknown_srp_username:
+                if a.description == AlertDescription.unknown_psk_identity:
                     print "Unknown SRP username"
                 elif a.description == AlertDescription.bad_record_mac:
                     if cmd == "serversrp" or cmd == "serversrpcert":
                         print "Bad SRP password for:", connection.allegedSrpUsername
                     else:
                         raise
                 elif a.description == AlertDescription.handshake_failure:
                     print "Unable to negotiate mutually acceptable parameters"
                 else:
                     raise
@@ skipping 24 matching lines @@
     else:
         print "Bad command: '%s'" % cmd
 except TLSRemoteAlert, a:
     print str(a)
     raise