Update security/py-crypto to 2.5

Upstream changes:

2.5
===
* Added PKCS#1 encryption schemes (v1.5 and OAEP). We now have
a decent, easy-to-use non-textbook RSA implementation. Yay!

* Added PKCS#1 signature schemes (v1.5 and PSS). v1.5 required some
extensive changes to Hash modules to contain the algorithm specific
ASN.1 OID. To that end, we now always have a (thin) Python module to
hide the one in pure C.

* Added 2 standard Key Derivation Functions (PBKDF1 and PBKDF2).

* Added export/import of RSA keys in OpenSSH and PKCS#8 formats.

* Added password-protected export/import of RSA keys (one old method
for PKCS#8 PEM only).

* Added ability to generate RSA key pairs with configurable public
exponent e.

* Added ability to construct an RSA key pair even if only the private
exponent d is known, and not p and q.

* Added SHA-2 C source code (fully from Lorenz Quack).

* Unit tests for all the above.

* Updates to documentation (both inline and in Doc/pycrypt.rst)

* All of the above changes were put together by Legrandin (Thanks!)

* Minor bug fixes (setup.py and tests).

3 files changed, 72 insertions, 24 deletions

diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index d94773e3353..0a37d3f2ed1 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2011/12/03 00:02:16 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2012/02/12 14:37:52 gls Exp $
 #
 
-DISTNAME=	pycrypto-2.4.1
+DISTNAME=	pycrypto-2.5
 PKGNAME=	${DISTNAME:S/^py/${PYPKGPREFIX}-/}
 CATEGORIES=	security python
 MASTER_SITES=	http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/
@@ -23,11 +23,8 @@ GNU_CONFIGURE=	yes
 do-test:
 	${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} ${PYSETUP} test
 
-PLIST_VARS+=	py25 py2x
+PLIST_VARS+=	py2x
 .include "../../lang/python/pyversion.mk"
-.if empty(PYPKGPREFIX:Mpy24)
-PLIST.py25=	yes
-.endif
 .if empty(PYPKGPREFIX:Mpy3?)
 PLIST.py2x=	yes
 .endif
diff --git a/security/py-crypto/PLIST b/security/py-crypto/PLIST
index f18fd7ee8f7..bc2c4b4fd88 100644
--- a/security/py-crypto/PLIST
+++ b/security/py-crypto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/10/30 13:30:36 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/02/12 14:37:52 gls Exp $
 ${PYSITELIB}/Crypto/Cipher/AES.so
 ${PYSITELIB}/Crypto/Cipher/ARC2.so
 ${PYSITELIB}/Crypto/Cipher/ARC4.so
@@ -6,6 +6,12 @@ ${PYSITELIB}/Crypto/Cipher/Blowfish.so
 ${PYSITELIB}/Crypto/Cipher/CAST.so
 ${PYSITELIB}/Crypto/Cipher/DES.so
 ${PYSITELIB}/Crypto/Cipher/DES3.so
+${PYSITELIB}/Crypto/Cipher/PKCS1_OAEP.py
+${PYSITELIB}/Crypto/Cipher/PKCS1_OAEP.pyc
+${PYSITELIB}/Crypto/Cipher/PKCS1_OAEP.pyo
+${PYSITELIB}/Crypto/Cipher/PKCS1_v1_5.py
+${PYSITELIB}/Crypto/Cipher/PKCS1_v1_5.pyc
+${PYSITELIB}/Crypto/Cipher/PKCS1_v1_5.pyo
 ${PYSITELIB}/Crypto/Cipher/XOR.so
 ${PYSITELIB}/Crypto/Cipher/__init__.py
 ${PYSITELIB}/Crypto/Cipher/__init__.pyc
@@ -13,28 +19,40 @@ ${PYSITELIB}/Crypto/Cipher/__init__.pyo
 ${PYSITELIB}/Crypto/Hash/HMAC.py
 ${PYSITELIB}/Crypto/Hash/HMAC.pyc
 ${PYSITELIB}/Crypto/Hash/HMAC.pyo
-${PYSITELIB}/Crypto/Hash/MD2.so
-${PYSITELIB}/Crypto/Hash/MD4.so
+${PYSITELIB}/Crypto/Hash/MD2.py
+${PYSITELIB}/Crypto/Hash/MD2.pyc
+${PYSITELIB}/Crypto/Hash/MD2.pyo
+${PYSITELIB}/Crypto/Hash/MD4.py
+${PYSITELIB}/Crypto/Hash/MD4.pyc
+${PYSITELIB}/Crypto/Hash/MD4.pyo
 ${PYSITELIB}/Crypto/Hash/MD5.py
 ${PYSITELIB}/Crypto/Hash/MD5.pyc
 ${PYSITELIB}/Crypto/Hash/MD5.pyo
 ${PYSITELIB}/Crypto/Hash/RIPEMD.py
 ${PYSITELIB}/Crypto/Hash/RIPEMD.pyc
 ${PYSITELIB}/Crypto/Hash/RIPEMD.pyo
-${PYSITELIB}/Crypto/Hash/RIPEMD160.so
 ${PYSITELIB}/Crypto/Hash/SHA.py
 ${PYSITELIB}/Crypto/Hash/SHA.pyc
 ${PYSITELIB}/Crypto/Hash/SHA.pyo
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA224.py
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA224.pyc
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA224.pyo
-${PYSITELIB}/Crypto/Hash/SHA256.so
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA384.py
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA384.pyc
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA384.pyo
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA512.py
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA512.pyc
-${PLIST.py25}${PYSITELIB}/Crypto/Hash/SHA512.pyo
+${PYSITELIB}/Crypto/Hash/SHA224.py
+${PYSITELIB}/Crypto/Hash/SHA224.pyc
+${PYSITELIB}/Crypto/Hash/SHA224.pyo
+${PYSITELIB}/Crypto/Hash/SHA256.py
+${PYSITELIB}/Crypto/Hash/SHA256.pyc
+${PYSITELIB}/Crypto/Hash/SHA256.pyo
+${PYSITELIB}/Crypto/Hash/SHA384.py
+${PYSITELIB}/Crypto/Hash/SHA384.pyc
+${PYSITELIB}/Crypto/Hash/SHA384.pyo
+${PYSITELIB}/Crypto/Hash/SHA512.py
+${PYSITELIB}/Crypto/Hash/SHA512.pyc
+${PYSITELIB}/Crypto/Hash/SHA512.pyo
+${PYSITELIB}/Crypto/Hash/_MD2.so
+${PYSITELIB}/Crypto/Hash/_MD4.so
+${PYSITELIB}/Crypto/Hash/_RIPEMD160.so
+${PYSITELIB}/Crypto/Hash/_SHA224.so
+${PYSITELIB}/Crypto/Hash/_SHA256.so
+${PYSITELIB}/Crypto/Hash/_SHA384.so
+${PYSITELIB}/Crypto/Hash/_SHA512.so
 ${PYSITELIB}/Crypto/Hash/__init__.py
 ${PYSITELIB}/Crypto/Hash/__init__.pyc
 ${PYSITELIB}/Crypto/Hash/__init__.pyo
@@ -44,6 +62,9 @@ ${PYSITELIB}/Crypto/Protocol/AllOrNothing.pyo
 ${PYSITELIB}/Crypto/Protocol/Chaffing.py
 ${PYSITELIB}/Crypto/Protocol/Chaffing.pyc
 ${PYSITELIB}/Crypto/Protocol/Chaffing.pyo
+${PYSITELIB}/Crypto/Protocol/KDF.py
+${PYSITELIB}/Crypto/Protocol/KDF.pyc
+${PYSITELIB}/Crypto/Protocol/KDF.pyo
 ${PYSITELIB}/Crypto/Protocol/__init__.py
 ${PYSITELIB}/Crypto/Protocol/__init__.pyc
 ${PYSITELIB}/Crypto/Protocol/__init__.pyo
@@ -141,6 +162,12 @@ ${PYSITELIB}/Crypto/SelfTest/Cipher/test_DES3.pyo
 ${PYSITELIB}/Crypto/SelfTest/Cipher/test_XOR.py
 ${PYSITELIB}/Crypto/SelfTest/Cipher/test_XOR.pyc
 ${PYSITELIB}/Crypto/SelfTest/Cipher/test_XOR.pyo
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_15.py
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_15.pyc
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_15.pyo
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_oaep.py
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_oaep.pyc
+${PYSITELIB}/Crypto/SelfTest/Cipher/test_pkcs1_oaep.pyo
 ${PYSITELIB}/Crypto/SelfTest/Hash/__init__.py
 ${PYSITELIB}/Crypto/SelfTest/Hash/__init__.pyc
 ${PYSITELIB}/Crypto/SelfTest/Hash/__init__.pyo
@@ -183,6 +210,9 @@ ${PYSITELIB}/Crypto/SelfTest/Protocol/__init__.pyo
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_AllOrNothing.py
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_AllOrNothing.pyc
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_AllOrNothing.pyo
+${PYSITELIB}/Crypto/SelfTest/Protocol/test_KDF.py
+${PYSITELIB}/Crypto/SelfTest/Protocol/test_KDF.pyc
+${PYSITELIB}/Crypto/SelfTest/Protocol/test_KDF.pyo
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_chaffing.py
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_chaffing.pyc
 ${PYSITELIB}/Crypto/SelfTest/Protocol/test_chaffing.pyo
@@ -240,6 +270,15 @@ ${PYSITELIB}/Crypto/SelfTest/Random/test_random.pyo
 ${PYSITELIB}/Crypto/SelfTest/Random/test_rpoolcompat.py
 ${PYSITELIB}/Crypto/SelfTest/Random/test_rpoolcompat.pyc
 ${PYSITELIB}/Crypto/SelfTest/Random/test_rpoolcompat.pyo
+${PYSITELIB}/Crypto/SelfTest/Signature/__init__.py
+${PYSITELIB}/Crypto/SelfTest/Signature/__init__.pyc
+${PYSITELIB}/Crypto/SelfTest/Signature/__init__.pyo
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_15.py
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_15.pyc
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_15.pyo
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_pss.py
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_pss.pyc
+${PYSITELIB}/Crypto/SelfTest/Signature/test_pkcs1_pss.pyo
 ${PYSITELIB}/Crypto/SelfTest/Util/__init__.py
 ${PYSITELIB}/Crypto/SelfTest/Util/__init__.pyc
 ${PYSITELIB}/Crypto/SelfTest/Util/__init__.pyo
@@ -261,6 +300,15 @@ ${PYSITELIB}/Crypto/SelfTest/__init__.pyo
 ${PYSITELIB}/Crypto/SelfTest/st_common.py
 ${PYSITELIB}/Crypto/SelfTest/st_common.pyc
 ${PYSITELIB}/Crypto/SelfTest/st_common.pyo
+${PYSITELIB}/Crypto/Signature/PKCS1_PSS.py
+${PYSITELIB}/Crypto/Signature/PKCS1_PSS.pyc
+${PYSITELIB}/Crypto/Signature/PKCS1_PSS.pyo
+${PYSITELIB}/Crypto/Signature/PKCS1_v1_5.py
+${PYSITELIB}/Crypto/Signature/PKCS1_v1_5.pyc
+${PYSITELIB}/Crypto/Signature/PKCS1_v1_5.pyo
+${PYSITELIB}/Crypto/Signature/__init__.py
+${PYSITELIB}/Crypto/Signature/__init__.pyc
+${PYSITELIB}/Crypto/Signature/__init__.pyo
 ${PYSITELIB}/Crypto/Util/Counter.py
 ${PYSITELIB}/Crypto/Util/Counter.pyc
 ${PYSITELIB}/Crypto/Util/Counter.pyo
@@ -293,6 +341,9 @@ ${PYSITELIB}/Crypto/Util/strxor.so
 ${PYSITELIB}/Crypto/Util/winrandom.py
 ${PYSITELIB}/Crypto/Util/winrandom.pyc
 ${PYSITELIB}/Crypto/Util/winrandom.pyo
+${PYSITELIB}/Crypto/Util/wrapper.py
+${PYSITELIB}/Crypto/Util/wrapper.pyc
+${PYSITELIB}/Crypto/Util/wrapper.pyo
 ${PYSITELIB}/Crypto/__init__.py
 ${PYSITELIB}/Crypto/__init__.pyc
 ${PYSITELIB}/Crypto/__init__.pyo
diff --git a/security/py-crypto/distinfo b/security/py-crypto/distinfo
index 54085f7a822..33eda475cb8 100644
--- a/security/py-crypto/distinfo
+++ b/security/py-crypto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/11/23 19:09:01 gls Exp $
+$NetBSD: distinfo,v 1.8 2012/02/12 14:37:52 gls Exp $
 
-SHA1 (pycrypto-2.4.1.tar.gz) = da028359986c9125b880b5b62b7c8ba06b733282
-RMD160 (pycrypto-2.4.1.tar.gz) = 7dbf3b0ca10e8f728772f0b282667e4ba94661c5
-Size (pycrypto-2.4.1.tar.gz) = 383032 bytes
+SHA1 (pycrypto-2.5.tar.gz) = 1fe50712e0776b45900f8032357201239223ab7e
+RMD160 (pycrypto-2.5.tar.gz) = 12f814b7c5e8842aa61bf28c5e877bba4433fdbe
+Size (pycrypto-2.5.tar.gz) = 426802 bytes
 SHA1 (patch-ab) = 2c72b0e70fdebd2e62aff28284afd919e935de08