3 files changed, 117 insertions, 144 deletions

diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile
index e4600fdc2559..696630f44dbd 100644
--- a/security/py-tlslite/Makefile
+++ b/security/py-tlslite/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	tlslite
-PORTVERSION=	0.3.8
+PORTVERSION=	0.4.0
 CATEGORIES=	security python
-MASTER_SITES=	http://trevp.net/tlslite/
+MASTER_SITES=	http://cloud.github.com/downloads/trevp/tlslite/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module implenting SSL 3.0, TLS 1.0 and TLS 1.1
 
-USE_PYTHON=	yes
+USE_PYTHON=		2.6-2.7
 USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-tlslite/distinfo b/security/py-tlslite/distinfo
index f3aeccc8f6f9..e4cbde346965 100644
--- a/security/py-tlslite/distinfo
+++ b/security/py-tlslite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tlslite-0.3.8.tar.gz) = 3d79170d8c3a662fa717b6401e8004208df113aaf3b18689bbeb704a23bf5b9f
-SIZE (tlslite-0.3.8.tar.gz) = 637558
+SHA256 (tlslite-0.4.0.tar.gz) = a97019f399e74937ae528e1d6eace9e51bd4e2e5ed1ffa7a4d3b61b38aaac32f
+SIZE (tlslite-0.4.0.tar.gz) = 532330
diff --git a/security/py-tlslite/pkg-plist b/security/py-tlslite/pkg-plist
index 0273a2b4813e..0bbc49b8b8d7 100644
--- a/security/py-tlslite/pkg-plist
+++ b/security/py-tlslite/pkg-plist
@@ -1,155 +1,83 @@
 bin/tls.py
 bin/tlsdb.py
-%%PYTHON_SITELIBDIR%%/tlslite/BaseDB.py
-%%PYTHON_SITELIBDIR%%/tlslite/BaseDB.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/BaseDB.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/Checker.py
-%%PYTHON_SITELIBDIR%%/tlslite/Checker.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/Checker.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/FileObject.py
-%%PYTHON_SITELIBDIR%%/tlslite/FileObject.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/FileObject.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/HandshakeSettings.py
-%%PYTHON_SITELIBDIR%%/tlslite/HandshakeSettings.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/HandshakeSettings.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/Session.py
-%%PYTHON_SITELIBDIR%%/tlslite/Session.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/Session.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/SessionCache.py
-%%PYTHON_SITELIBDIR%%/tlslite/SessionCache.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/SessionCache.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/SharedKeyDB.py
-%%PYTHON_SITELIBDIR%%/tlslite/SharedKeyDB.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/SharedKeyDB.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/TLSConnection.py
-%%PYTHON_SITELIBDIR%%/tlslite/TLSConnection.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/TLSConnection.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/TLSRecordLayer.py
-%%PYTHON_SITELIBDIR%%/tlslite/TLSRecordLayer.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/TLSRecordLayer.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/VerifierDB.py
-%%PYTHON_SITELIBDIR%%/tlslite/VerifierDB.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/VerifierDB.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/X509.py
-%%PYTHON_SITELIBDIR%%/tlslite/X509.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/X509.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/X509CertChain.py
-%%PYTHON_SITELIBDIR%%/tlslite/X509CertChain.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/X509CertChain.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/__init__.py
 %%PYTHON_SITELIBDIR%%/tlslite/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/api.py
 %%PYTHON_SITELIBDIR%%/tlslite/api.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/api.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/basedb.py
+%%PYTHON_SITELIBDIR%%/tlslite/basedb.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/basedb.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/checker.py
+%%PYTHON_SITELIBDIR%%/tlslite/checker.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/checker.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/constants.py
 %%PYTHON_SITELIBDIR%%/tlslite/constants.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/constants.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/errors.py
 %%PYTHON_SITELIBDIR%%/tlslite/errors.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/errors.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/AsyncStateMachine.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/AsyncStateMachine.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/AsyncStateMachine.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/ClientHelper.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/ClientHelper.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/ClientHelper.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/HTTPTLSConnection.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/HTTPTLSConnection.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/HTTPTLSConnection.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IMAP4_TLS.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IMAP4_TLS.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IMAP4_TLS.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IntegrationHelper.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IntegrationHelper.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/IntegrationHelper.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/POP3_TLS.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/POP3_TLS.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/POP3_TLS.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/SMTP_TLS.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/SMTP_TLS.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/SMTP_TLS.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSAsyncDispatcherMixIn.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSAsyncDispatcherMixIn.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSAsyncDispatcherMixIn.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSSocketServerMixIn.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSSocketServerMixIn.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSSocketServerMixIn.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSTwistedProtocolWrapper.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSTwistedProtocolWrapper.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/TLSTwistedProtocolWrapper.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/integration/XMLRPCTransport.py
-%%PYTHON_SITELIBDIR%%/tlslite/integration/XMLRPCTransport.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/integration/XMLRPCTransport.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/handshakesettings.py
+%%PYTHON_SITELIBDIR%%/tlslite/handshakesettings.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/handshakesettings.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/integration/__init__.py
 %%PYTHON_SITELIBDIR%%/tlslite/integration/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/integration/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/asyncstatemachine.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/asyncstatemachine.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/asyncstatemachine.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/clienthelper.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/clienthelper.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/clienthelper.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/httptlsconnection.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/httptlsconnection.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/httptlsconnection.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/imap4_tls.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/imap4_tls.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/imap4_tls.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/pop3_tls.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/pop3_tls.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/pop3_tls.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/smtp_tls.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/smtp_tls.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/smtp_tls.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlsasyncdispatchermixin.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlsasyncdispatchermixin.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlsasyncdispatchermixin.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlssocketservermixin.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlssocketservermixin.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/tlssocketservermixin.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/integration/xmlrpctransport.py
+%%PYTHON_SITELIBDIR%%/tlslite/integration/xmlrpctransport.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/integration/xmlrpctransport.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/mathtls.py
 %%PYTHON_SITELIBDIR%%/tlslite/mathtls.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/mathtls.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/messages.py
 %%PYTHON_SITELIBDIR%%/tlslite/messages.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/messages.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/AES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/AES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/AES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/ASN1Parser.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/ASN1Parser.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/ASN1Parser.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_AES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_AES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_AES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_RC4.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_RC4.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_RC4.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_TripleDES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_TripleDES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Cryptlib_TripleDES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_AES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_AES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_AES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RC4.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RC4.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RC4.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RSAKey.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RSAKey.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_RSAKey.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_TripleDES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_TripleDES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/OpenSSL_TripleDES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_AES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_AES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_AES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RC4.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RC4.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RC4.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RSAKey.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RSAKey.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_RSAKey.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_TripleDES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_TripleDES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/PyCrypto_TripleDES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_AES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_AES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_AES.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RC4.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RC4.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RC4.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RSAKey.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RSAKey.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/Python_RSAKey.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RC4.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RC4.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RC4.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RSAKey.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RSAKey.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/RSAKey.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/TripleDES.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/TripleDES.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/TripleDES.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/session.py
+%%PYTHON_SITELIBDIR%%/tlslite/session.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/session.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/sessioncache.py
+%%PYTHON_SITELIBDIR%%/tlslite/sessioncache.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/sessioncache.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/tlsconnection.py
+%%PYTHON_SITELIBDIR%%/tlslite/tlsconnection.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/tlsconnection.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/tlsrecordlayer.py
+%%PYTHON_SITELIBDIR%%/tlslite/tlsrecordlayer.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/tlsrecordlayer.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/aes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/aes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/aes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/asn1parser.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/asn1parser.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/asn1parser.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cipherfactory.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cipherfactory.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cipherfactory.pyo
@@ -162,24 +90,69 @@ bin/tlsdb.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cryptomath.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cryptomath.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/utils/cryptomath.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/dateFuncs.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/dateFuncs.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/dateFuncs.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/hmac.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/hmac.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/hmac.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/jython_compat.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/jython_compat.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/jython_compat.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/datefuncs.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/datefuncs.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/datefuncs.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/utils/keyfactory.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/keyfactory.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/utils/keyfactory.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_aes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_aes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_aes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rc4.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rc4.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rc4.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rsakey.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rsakey.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_rsakey.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_tripledes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_tripledes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/openssl_tripledes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_aes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_aes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_aes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rc4.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rc4.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rc4.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rsakey.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rsakey.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_rsakey.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_tripledes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_tripledes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/pycrypto_tripledes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_aes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_aes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_aes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rc4.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rc4.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rc4.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rsakey.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rsakey.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/python_rsakey.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rc4.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rc4.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rc4.pyo
 %%PYTHON_SITELIBDIR%%/tlslite/utils/rijndael.py
 %%PYTHON_SITELIBDIR%%/tlslite/utils/rijndael.pyc
 %%PYTHON_SITELIBDIR%%/tlslite/utils/rijndael.pyo
-%%PYTHON_SITELIBDIR%%/tlslite/utils/xmltools.py
-%%PYTHON_SITELIBDIR%%/tlslite/utils/xmltools.pyc
-%%PYTHON_SITELIBDIR%%/tlslite/utils/xmltools.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/tlslite/utils
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rsakey.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rsakey.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/rsakey.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tackwrapper.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tackwrapper.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tackwrapper.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tripledes.py
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tripledes.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/utils/tripledes.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/verifierdb.py
+%%PYTHON_SITELIBDIR%%/tlslite/verifierdb.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/verifierdb.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/x509.py
+%%PYTHON_SITELIBDIR%%/tlslite/x509.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/x509.pyo
+%%PYTHON_SITELIBDIR%%/tlslite/x509certchain.py
+%%PYTHON_SITELIBDIR%%/tlslite/x509certchain.pyc
+%%PYTHON_SITELIBDIR%%/tlslite/x509certchain.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/tlslite/integration
+@dirrm %%PYTHON_SITELIBDIR%%/tlslite/utils
 @dirrm %%PYTHON_SITELIBDIR%%/tlslite