diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 6b4005fb8008..a78462c53af2 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	pycrypto
-PORTVERSION=	2.0.1
-PORTREVISION=	4
+PORTVERSION=	2.1.0
 CATEGORIES=	security python
-MASTER_SITES=	http://www.amk.ca/files/python/crypto/
+MASTER_SITES=	http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	kmgaughan@eircom.net
+MAINTAINER=	k@stereochro.me
 COMMENT=	The Python Cryptography Toolkit
 
 USE_PYTHON=	yes
@@ -20,13 +19,7 @@ USE_PYDISTUTILS=yes
 
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
 
-pre-configure:
+pre-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/setup.py
 
-.include <bsd.port.pre.mk>
-
-.if (${PYTHON_REL} >= 250)
-EXTRA_PATCHES+=	${FILESDIR}/python25+.txt
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/py-pycrypto/distinfo b/security/py-pycrypto/distinfo
index e128689bcd65..ef27712b7c99 100644
--- a/security/py-pycrypto/distinfo
+++ b/security/py-pycrypto/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycrypto-2.0.1.tar.gz) = 4d5674f3898a573691ffb335e8d749cd
-SHA256 (pycrypto-2.0.1.tar.gz) = b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
-SIZE (pycrypto-2.0.1.tar.gz) = 154292
+MD5 (pycrypto-2.1.0.tar.gz) = 1d3eb04f06e6f09a080bc37fb019f9bf
+SHA256 (pycrypto-2.1.0.tar.gz) = 253e1c22ea0249f0429df4f7e2eb973b119c83b146c0f421298f5e8e6822d8a2
+SIZE (pycrypto-2.1.0.tar.gz) = 265388
diff --git a/security/py-pycrypto/files/patch-setup.py b/security/py-pycrypto/files/patch-setup.py
index 8c89fdc14df6..d959eedfeb1a 100644
--- a/security/py-pycrypto/files/patch-setup.py
+++ b/security/py-pycrypto/files/patch-setup.py
@@ -1,20 +1,27 @@
---- setup.py.orig	Sat Aug 14 01:44:47 2004
-+++ setup.py	Fri Oct  1 21:21:45 2004
-@@ -116,13 +116,14 @@
-         build_ext.build_extensions(self)
+--- ./setup.py.orig	2009-12-13 21:39:29.000000000 +0100
++++ ./setup.py	2009-12-14 16:48:47.000000000 +0100
+@@ -136,6 +136,7 @@
+                 # especially helps the DES modules.
+                 self.__add_compiler_option("-O3")
+                 self.__add_compiler_option("-fomit-frame-pointer")
++                self.__add_compiler_option("-D_WCHAR_T_DEFINED")
+                 # Don't include debug symbols unless debugging
+                 self.__remove_compiler_option("-g")
+             if USE_GCOV:
+@@ -152,7 +153,7 @@
+             self.compiler.include_dirs.insert(0, "src/inc-msvc/")
  
-     def detect_modules (self):
+         # Detect libgmp and don't build _fastmath if it is missing.
 -        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
--        inc_dirs = self.compiler.include_dirs + ['/usr/include']
 +        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib', '%%LOCALBASE%%/lib']
-+        inc_dirs = self.compiler.include_dirs + ['/usr/include', '%%LOCALBASE%%/include']
-         exts = []
-         if (self.compiler.find_library_file(lib_dirs, 'gmp')):
-             exts.append(Extension("Crypto.PublicKey._fastmath",
--                                  include_dirs=['src/'],
-+                                  include_dirs=['src/', '%%LOCALBASE%%/include'],
-                                   libraries=['gmp'],
-+				  library_dirs=['%%LOCALBASE%%/lib'],
-                                   sources=["src/_fastmath.c"]))
-         self.extensions += exts
+         if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
+             print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."
+             self.__remove_extensions(["Crypto.PublicKey._fastmath"])
+@@ -259,6 +260,7 @@
+             Extension("Crypto.PublicKey._fastmath",
+                       include_dirs=['src/'],
+                       libraries=['gmp'],
++                      library_dirs=['%%LOCALBASE%%/lib'],
+                       sources=["src/_fastmath.c"]),
  
+             # Hash functions
diff --git a/security/py-pycrypto/files/patch-src-ARC2.c b/security/py-pycrypto/files/patch-src-ARC2.c
deleted file mode 100644
index e4df631c1ce2..000000000000
--- a/security/py-pycrypto/files/patch-src-ARC2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/ARC2.c b/src/ARC2.c
-index eb61713..35d9151 100644
---- src/ARC2.c
-+++ src/ARC2.c
-@@ -11,6 +11,7 @@
-  */
- 
- #include <string.h>  
-+#include "Python.h"
- 
- #define MODULE_NAME ARC2
- #define BLOCK_SIZE 8
-@@ -144,6 +145,12 @@ block_init(block_state *self, U8 *key, int keylength)
- 		197,243,219, 71,229,165,156,119, 10,166, 32,104,254,127,193,173
-         };
- 
-+	if ((U32)keylength > sizeof(self->xkey)) {
-+		PyErr_SetString(PyExc_ValueError,
-+				"ARC2 key length must be less than 128 bytes");
-+		return;
-+	}
-+
- 	memcpy(self->xkey, key, keylength);
-   
- 	/* Phase 1: Expand input key to 128 bytes */
diff --git a/security/py-pycrypto/files/python25+.txt b/security/py-pycrypto/files/python25+.txt
deleted file mode 100644
index 7e00448b75a7..000000000000
--- a/security/py-pycrypto/files/python25+.txt
+++ /dev/null
@@ -1,58 +0,0 @@
---- Hash/MD5.py.orig	2009-06-19 12:46:41.000000000 +0100
-+++ Hash/MD5.py	2009-06-19 12:50:24.000000000 +0100
-@@ -3,11 +3,20 @@
- 
- __revision__ = "$Id: MD5.py,v 1.4 2002/07/11 14:31:19 akuchling Exp $"
- 
--from md5 import *
-+__all__ = ['new', 'digest_size']
- 
--import md5
--if hasattr(md5, 'digestsize'):
--    digest_size = digestsize
--    del digestsize
--del md5
- 
-+try:
-+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
-+    import hashlib
-+    def new(data=""):
-+        return hashlib.md5(data)
-+    digest_size = new().digest_size
-+
-+except ImportError:
-+    from md5 import *
-+    import md5
-+    if hasattr(md5, 'digestsize'):
-+        digest_size = digestsize
-+        del digestsize
-+    del md5
---- Hash/SHA.py.orig	2009-06-19 12:46:52.000000000 +0100
-+++ Hash/SHA.py	2009-06-19 12:49:49.000000000 +0100
-@@ -3,9 +3,20 @@
- 
- __revision__ = "$Id: SHA.py,v 1.4 2002/07/11 14:31:19 akuchling Exp $"
- 
--from sha import *
--import sha
--if hasattr(sha, 'digestsize'):
--    digest_size = digestsize
--    del digestsize
--del sha
-+__all__ = ['new', 'digest_size']
-+
-+
-+try:
-+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
-+    import hashlib
-+    def new(data=""):
-+        return hashlib.sha1(data)
-+    digest_size = new().digest_size
-+
-+except ImportError:
-+    from sha import *
-+    import sha
-+    if hasattr(sha, 'digestsize'):
-+        digest_size = digestsize
-+        del digestsize
-+    del sha
diff --git a/security/py-pycrypto/pkg-descr b/security/py-pycrypto/pkg-descr
index 3eb3de691de0..edc2e5502a6b 100644
--- a/security/py-pycrypto/pkg-descr
+++ b/security/py-pycrypto/pkg-descr
@@ -2,7 +2,7 @@ Python Cryptography Toolkit (pycrypto)
 ======================================
 
 This is a collection of both secure hash functions (such as MD5 and
-SHA), and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal,
-etc.) for Python.
+SHA), and various encryption algorithms (AES, DES, ElGamal, etc.) for
+Python.
 
 WWW:	http://pycrypto.org
diff --git a/security/py-pycrypto/pkg-plist b/security/py-pycrypto/pkg-plist
index 589cd53ae95f..cc6b60b77d82 100644
--- a/security/py-pycrypto/pkg-plist
+++ b/security/py-pycrypto/pkg-plist
@@ -5,8 +5,6 @@
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/CAST.so
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/DES.so
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/DES3.so
-%%PYTHON_SITELIBDIR%%/Crypto/Cipher/IDEA.so
-%%PYTHON_SITELIBDIR%%/Crypto/Cipher/RC5.so
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/XOR.so
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/Cipher/__init__.pyc
@@ -19,7 +17,10 @@
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/MD5.py
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/MD5.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/MD5.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/Hash/RIPEMD.so
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/RIPEMD.py
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/RIPEMD.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/RIPEMD.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/RIPEMD160.so
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.py
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.pyo
@@ -45,38 +46,237 @@
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/RSA.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/RSA.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/RSA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_DSA.py
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_DSA.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_DSA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_RSA.py
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_RSA.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_RSA.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.py
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/pubkey.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/pubkey.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/pubkey.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/qNEW.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/qNEW.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/qNEW.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_fastmath.so
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaAccumulator.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaAccumulator.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaAccumulator.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaGenerator.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaGenerator.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/FortunaGenerator.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/SHAd256.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/SHAd256.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/SHAd256.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/fallback.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/fallback.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/fallback.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/nt.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/nt.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/nt.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/posix.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/posix.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/posix.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/rng_base.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/rng_base.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG/rng_base.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/_UserFriendlyRNG.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/_UserFriendlyRNG.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/_UserFriendlyRNG.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Random/random.py
+%%PYTHON_SITELIBDIR%%/Crypto/Random/random.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Random/random.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/common.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/common.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/common.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_AES.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_AES.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_AES.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC2.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC2.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC2.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC4.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC4.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_ARC4.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_Blowfish.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_Blowfish.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_Blowfish.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_CAST.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_CAST.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_CAST.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES3.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES3.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_DES3.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_XOR.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_XOR.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher/test_XOR.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/common.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/common.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/common.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_HMAC.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_HMAC.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_HMAC.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD2.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD2.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD2.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD4.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD4.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD4.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD5.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD5.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_MD5.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_RIPEMD.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_RIPEMD.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_RIPEMD.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_rfc1751.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_rfc1751.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_rfc1751.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_DSA.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_DSA.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_DSA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaAccumulator.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaAccumulator.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaAccumulator.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaGenerator.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaGenerator.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_FortunaGenerator.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_SHAd256.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_SHAd256.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/test_SHAd256.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_fallback.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_fallback.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_fallback.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_generic.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_generic.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_generic.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_nt.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_nt.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_nt.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_posix.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_posix.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_posix.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_winrandom.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_winrandom.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG/test_winrandom.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_random.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_random.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_random.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_rpoolcompat.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_rpoolcompat.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/test_rpoolcompat.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_winrandom.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_winrandom.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_winrandom.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/__init__.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/RFC1751.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/RFC1751.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/RFC1751.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/_counter.so
+%%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/Util/test.py
-%%PYTHON_SITELIBDIR%%/Crypto/Util/test.pyc
-%%PYTHON_SITELIBDIR%%/Crypto/Util/test.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/strxor.so
+%%PYTHON_SITELIBDIR%%/Crypto/Util/winrandom.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/winrandom.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/winrandom.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/test.py
-%%PYTHON_SITELIBDIR%%/Crypto/test.pyc
-%%PYTHON_SITELIBDIR%%/Crypto/test.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/pct_warnings.py
+%%PYTHON_SITELIBDIR%%/Crypto/pct_warnings.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/pct_warnings.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/Util
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/OSRNG
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/Random
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/PublicKey
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/Protocol
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/Hash