Perform tlslite 0.3.8 -> 0.4.6 renames ahead of time.

third_party/tlslite/tlslite/utils/cipherfactory.py

Index: third_party/tlslite/tlslite/utils/cipherfactory.py
diff --git a/third_party/tlslite/tlslite/utils/cipherfactory.py b/third_party/tlslite/tlslite/utils/cipherfactory.py
index ccbb6b5ff9b7f71c7850dc6d650df4a4bc49bc90..331f72469c50373387e165f0f61e10096e207701 100644
--- a/third_party/tlslite/tlslite/utils/cipherfactory.py
+++ b/third_party/tlslite/tlslite/utils/cipherfactory.py
@@ -2,29 +2,29 @@
 
 import os
 
-import Python_AES
-import Python_RC4
+import python_aes
+import python_rc4
 
 import cryptomath
 
 tripleDESPresent = False
 
 if cryptomath.m2cryptoLoaded:
-    import OpenSSL_AES
-    import OpenSSL_RC4
-    import OpenSSL_TripleDES
+    import openssl_aes
+    import openssl_rc4
+    import openssl_tripledes
     tripleDESPresent = True
 
 if cryptomath.cryptlibpyLoaded:
-    import Cryptlib_AES
-    import Cryptlib_RC4
-    import Cryptlib_TripleDES
+    import cryptlib_aes
+    import cryptlib_rc4
+    import cryptlib_tripledes
     tripleDESPresent = True
 
 if cryptomath.pycryptoLoaded:
-    import PyCrypto_AES
-    import PyCrypto_RC4
-    import PyCrypto_TripleDES
+    import pycrypto_aes
+    import pycrypto_rc4
+    import pycrypto_tripledes
     tripleDESPresent = True
 
 # **************************************************************************
@@ -48,13 +48,13 @@ def createAES(key, IV, implList=None):
 
     for impl in implList:
         if impl == "cryptlib" and cryptomath.cryptlibpyLoaded:
-            return Cryptlib_AES.new(key, 2, IV)
+            return cryptlib_aes.new(key, 2, IV)
         elif impl == "openssl" and cryptomath.m2cryptoLoaded:
-            return OpenSSL_AES.new(key, 2, IV)
+            return openssl_aes.new(key, 2, IV)
         elif impl == "pycrypto" and cryptomath.pycryptoLoaded:
-            return PyCrypto_AES.new(key, 2, IV)
+            return pycrypto_aes.new(key, 2, IV)
         elif impl == "python":
-            return Python_AES.new(key, 2, IV)
+            return python_aes.new(key, 2, IV)
     raise NotImplementedError()
 
 def createRC4(key, IV, implList=None):
@@ -76,13 +76,13 @@ def createRC4(key, IV, implList=None):
         raise AssertionError()
     for impl in implList:
         if impl == "cryptlib" and cryptomath.cryptlibpyLoaded:
-            return Cryptlib_RC4.new(key)
+            return cryptlib_rc4.new(key)
         elif impl == "openssl" and cryptomath.m2cryptoLoaded:
-            return OpenSSL_RC4.new(key)
+            return openssl_rc4.new(key)
         elif impl == "pycrypto" and cryptomath.pycryptoLoaded:
-            return PyCrypto_RC4.new(key)
+            return pycrypto_rc4.new(key)
         elif impl == "python":
-            return Python_RC4.new(key)
+            return python_rc4.new(key)
     raise NotImplementedError()
 
 #Create a new TripleDES instance
@@ -103,9 +103,9 @@ def createTripleDES(key, IV, implList=None):
 
     for impl in implList:
         if impl == "cryptlib" and cryptomath.cryptlibpyLoaded:
-           return Cryptlib_TripleDES.new(key, 2, IV)
+           return cryptlib_tripledes.new(key, 2, IV)
         elif impl == "openssl" and cryptomath.m2cryptoLoaded:
-            return OpenSSL_TripleDES.new(key, 2, IV)
+            return openssl_tripledes.new(key, 2, IV)
         elif impl == "pycrypto" and cryptomath.pycryptoLoaded:
-            return PyCrypto_TripleDES.new(key, 2, IV)
-    raise NotImplementedError()
+            return pycrypto_tripledes.new(key, 2, IV)
+    raise NotImplementedError()