CVE-2013-1445 update to py-crypto 2.6.1, and drop mpi@ as maintainer at

his request.  http://lists.dlitz.net/pipermail/pycrypto/2013q4/000702.html
(prng reseed problem at fork). ok mpi@ rpe@
This commit is contained in:
sthen 2014-05-11 20:58:23 +00:00
parent 6664d5a4d1
commit f809ddceb7
5 changed files with 24 additions and 32 deletions

View File

@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.31 2013/05/30 13:09:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.32 2014/05/11 20:58:23 sthen Exp $
SHARED_ONLY = Yes
COMMENT = cryptographic tools for Python
MODPY_EGG_VERSION = 2.6
MODPY_EGG_VERSION = 2.6.1
DISTNAME = pycrypto-${MODPY_EGG_VERSION}
PKGNAME = py-crypto-${MODPY_EGG_VERSION}
CATEGORIES = security devel
REVISION = 1
CATEGORIES = security devel
HOMEPAGE = https://www.dlitz.net/software/pycrypto/
MAINTAINER = Martin Pieuchot <mpi@openbsd.org>
# Public domain (patented algorithms removed by patch)
PERMIT_PACKAGE_CDROM = Yes
@ -26,13 +23,13 @@ FLAVOR ?=
LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
devel/gmp
WANTLIB = ${MODPY_WANTLIB} gmp
WANTLIB = ${MODPY_WANTLIB} gmp pthread
# XXX Don't set CONFIGURE_STYLE=simple otherwise python.port.mk will
# not define do-build and do-install
CONFIGURE_ARGS = CFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS += -I${LOCALBASE}/include
CFLAGS += -I${LOCALBASE}/include
DOCSDIR = ${PREFIX}/share/doc/py-crypto

View File

@ -1,5 +1,2 @@
MD5 (pycrypto-2.6.tar.gz) = iNrQonDR/oOjngRnpmoiuw==
RMD160 (pycrypto-2.6.tar.gz) = V4K1KdWfKmKVFgf9r6pDSuoT7go=
SHA1 (pycrypto-2.6.tar.gz) = wX5BqAs/vy7k6PLYu54oxdCLu4Q=
SHA256 (pycrypto-2.6.tar.gz) = cpPJ1+ivLkSoL4brnDsFiID0vMiEvzrWyKNLZJhu3eg=
SIZE (pycrypto-2.6.tar.gz) = 443445
SHA256 (pycrypto-2.6.1.tar.gz) = 8s4emJsnLPy2d2FnY+Ci5+xlnv+meoiqkrOmVSj2Cjw=
SIZE (pycrypto-2.6.1.tar.gz) = 446240

View File

@ -1,21 +1,17 @@
$OpenBSD: patch-lib_Crypto_Hash___init___py,v 1.6 2013/11/08 15:26:05 ajacoutot Exp $
$OpenBSD: patch-lib_Crypto_Hash___init___py,v 1.7 2014/05/11 20:58:23 sthen Exp $
Patch with reduced context as otherwise CVS Id would get expanded.
*** lib/Crypto/Hash/__init__.py.orig Thu May 24 14:55:30 2012
--- lib/Crypto/Hash/__init__.py Fri May 25 14:09:50 2012
*************** The hashing modules here all support the interface des
*** 48,53 ****
! :undocumented: _MD2, _MD4, _RIPEMD160, _SHA224, _SHA256, _SHA384, _SHA512
"""
! __all__ = ['HMAC', 'MD2', 'MD4', 'MD5', 'RIPEMD', 'SHA',
'SHA224', 'SHA256', 'SHA384', 'SHA512']
--- 48,53 ----
! :undocumented: _MD4, _RIPEMD160, _SHA224, _SHA256, _SHA384, _SHA512
"""
! __all__ = ['HMAC', 'MD4', 'MD5', 'RIPEMD', 'SHA',
'SHA224', 'SHA256', 'SHA384', 'SHA512']
--- lib/Crypto/Hash/__init__.py.orig Mon Oct 14 22:38:10 2013
+++ lib/Crypto/Hash/__init__.py Sun May 11 19:56:54 2014
@@ -46,10 +46,10 @@ The hashing modules here all support the interface des
.. _`PEP 247` : http://www.python.org/dev/peps/pep-0247/
-:undocumented: _MD2, _MD4, _RIPEMD160, _SHA224, _SHA256, _SHA384, _SHA512
+:undocumented: _MD4, _RIPEMD160, _SHA224, _SHA256, _SHA384, _SHA512
"""
-__all__ = ['HMAC', 'MD2', 'MD4', 'MD5', 'RIPEMD', 'SHA',
+__all__ = ['HMAC', 'MD4', 'MD5', 'RIPEMD', 'SHA',
'SHA224', 'SHA256', 'SHA384', 'SHA512']

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.no-python3,v 1.2 2014/05/11 20:58:23 sthen Exp $
lib/python${MODPY_VERSION}/site-packages/Crypto/Random/OSRNG/nt.py
lib/python${MODPY_VERSION}/site-packages/Crypto/Random/OSRNG/nt.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/py21compat.py

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2012/06/27 19:02:21 rpointel Exp $
@comment $OpenBSD: PLIST,v 1.13 2014/05/11 20:58:23 sthen Exp $
!%%python3%%
lib/python${MODPY_VERSION}/site-packages/Crypto/
lib/python${MODPY_VERSION}/site-packages/Crypto/Cipher/
@ -226,6 +226,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/${MODPY_PYCACHE}test_random.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/${MODPY_PYCACHE}test_rpoolcompat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/test__UserFriendlyRNG.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/test_random.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Random/test_rpoolcompat.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Signature/