Attachment 179645 Details for Bug 216825 – patch

[patch] patch

py-cryptography.patch (text/plain), 3.41 KB, created by Piotr Kubaj on 2017-02-05 13:59:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-05 13:59:23 UTC

Size: 3.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433337)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cryptography
>-PORTVERSION=	1.6
>+PORTVERSION=	1.7.2
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -37,6 +37,10 @@
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
> .endif
> 
>+.if ${SSL_DEFAULT:Mlibressl-devel}
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src___cffi__src_openssl_x509__vfy.py
>+.endif
>+
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 433337)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1480367088
>-SHA256 (cryptography-1.6.tar.gz) = 4d0d86d2c8d3fc89133c3fa0d164a688a458b6663ab6fa965c80d6c2cdaf9b3f
>-SIZE (cryptography-1.6.tar.gz) = 410073
>+TIMESTAMP = 1486301990
>+SHA256 (cryptography-1.7.2.tar.gz) = 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9
>+SIZE (cryptography-1.7.2.tar.gz) = 420867
>Index: files/extra-patch-src___cffi__src_openssl_x509__vfy.py
>===================================================================
>--- files/extra-patch-src___cffi__src_openssl_x509__vfy.py	(revision 0)
>+++ files/extra-patch-src___cffi__src_openssl_x509__vfy.py	(working copy)
>@@ -0,0 +1,32 @@
>+--- src/_cffi_src/openssl/x509_vfy.py.orig      2017-02-05 13:30:10 UTC
>++++ src/_cffi_src/openssl/x509_vfy.py
>+@@ -194,10 +194,12 @@ void X509_STORE_CTX_set0_crls(X509_STORE
>+ int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *, const char *,
>+                                 size_t);
>+ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *, unsigned int);
>+-int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *, const char *,
>+-                                 size_t);
>+-int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *, const unsigned char *,
>+-                              size_t);
>++/* Fails with recent LibreSSL; ffi doesn't support ifdefs here */
>++// int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *, const char *,
>++//                                  size_t);
>++// int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *, const unsigned char *,
>++//                               size_t);
>++/****/
>+ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *, const char *);
>+
>+ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJECT *);
>+@@ -221,10 +223,12 @@ static const long X509_V_ERR_SUITE_B_INV
>+ static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
>+ static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
>+ static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
>++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050100fL
>+ static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
>+ static const long X509_V_ERR_EMAIL_MISMATCH = 0;
>+ static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
>+ #endif
>++#endif
>+
>+ /* OpenSSL 1.0.2beta2+ verification parameters */
>+ #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \
>
>Property changes on: files/extra-patch-src___cffi__src_openssl_x509__vfy.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216825: 179645 | 179688