Attachment #213873 for bug #245929




# $FreeBSD$

PORTNAME=	cryptography
PORTVERSION=	2.9.2
CATEGORIES=	security python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.BSD

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
		${PY_ENUM34} \
		${PY_IPADDRESS} \
		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=2.9.2:security/py-cryptography-vectors@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \

	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so

do-test:
	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/security/py-cryptography/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551354433	1	TIMESTAMP = 1587899355
2	SHA256 (cryptography-2.6.1.tar.gz) = 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6	2	SHA256 (cryptography-2.9.2.tar.gz) = a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
3	SIZE (cryptography-2.6.1.tar.gz) = 491580	3	SIZE (cryptography-2.9.2.tar.gz) = 517571




# security/py-cryptography fails to build with libressl-2.9.1
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237487
# Use generic DTLS functions added in LibreSSL 2.9.1
# https://github.com/pyca/cryptography/pull/4855

index 4124dcb879..ac32fdffde 100644
--- src/_cffi_src/openssl/cryptography.py.orig
+++ src/_cffi_src/openssl/cryptography.py
@@ -38,9 +38,12 @@
     (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
     (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
+    (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
 #else
 #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
 #endif
 
 #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 92fd1e3ec8..da21f3ce90 100644
--- src/_cffi_src/openssl/ssl.py.orig
+++ src/_cffi_src/openssl/ssl.py
@@ -719,17 +719,20 @@
 static const long TLS_ST_OK = 0;
 #endif
 
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
 static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
 const SSL_METHOD *(*DTLS_method)(void) = NULL;
 const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
 const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
+#else
+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
+#endif
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
 static const long SSL_OP_NO_DTLSv1 = 0;
 static const long SSL_OP_NO_DTLSv1_2 = 0;
 long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
 long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
-#else
-static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
 #endif
 
 static const long Cryptography_HAS_DTLS = 1;
- 

Return to bug 245929

Lines 2-8 Link Here

(-)b/security/py-cryptography/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptography	4	PORTNAME= cryptography
5	PORTVERSION= 2.6.1	5	PORTVERSION= 2.9.2
6	CATEGORIES= security python	6	CATEGORIES= security python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-27 LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE Link Here
16	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD	16	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD
17		17
18	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR}	18	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR}
19	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${PY_FLAVOR} \	19	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
21	${PY_ENUM34} \	20	${PY_ENUM34} \
22	${PY_IPADDRESS} \	21	${PY_IPADDRESS} \
23	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}	22	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}
24	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=${PORTVERSION}:security/py-cryptography-vectors@${PY_FLAVOR} \	23	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=2.9.2:security/py-cryptography-vectors@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \
Lines 47-52 post-install: Link Here
47	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so	46	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so
48		47
49	do-test:	48	do-test:
50	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test	49	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest
51		50
52	.include <bsd.port.post.mk>	51	.include <bsd.port.post.mk>

Removed Link Here

(-)a/security/py-cryptography/files/patch-PR4855 (-50 lines)
1	# security/py-cryptography fails to build with libressl-2.9.1
2	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237487
3	# Use generic DTLS functions added in LibreSSL 2.9.1
4	# https://github.com/pyca/cryptography/pull/4855
5
6	index 4124dcb879..ac32fdffde 100644
7	--- src/_cffi_src/openssl/cryptography.py.orig
8	+++ src/_cffi_src/openssl/cryptography.py
9	@@ -38,9 +38,12 @@
10	(LIBRESSL_VERSION_NUMBER >= 0x2070000f)
11	#define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
12	(LIBRESSL_VERSION_NUMBER >= 0x2080000f)
13	+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
14	+ (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
15	#else
16	#define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
17	#define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
18	+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
19	#endif
20
21	#define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
22	diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
23	index 92fd1e3ec8..da21f3ce90 100644
24	--- src/_cffi_src/openssl/ssl.py.orig
25	+++ src/_cffi_src/openssl/ssl.py
26	@@ -719,17 +719,20 @@
27	static const long TLS_ST_OK = 0;
28	#endif
29
30	-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
31	+/* LibreSSL 2.9.1 added only the DTLS__method functions /
32	+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
33	static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
34	const SSL_METHOD (DTLS_method)(void) = NULL;
35	const SSL_METHOD (DTLS_server_method)(void) = NULL;
36	const SSL_METHOD (DTLS_client_method)(void) = NULL;
37	+#else
38	+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
39	+#endif
40	+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
41	static const long SSL_OP_NO_DTLSv1 = 0;
42	static const long SSL_OP_NO_DTLSv1_2 = 0;
43	long (DTLS_set_link_mtu)(SSL , long) = NULL;
44	long (DTLS_get_link_min_mtu)(SSL ) = NULL;
45	-#else
46	-static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
47	#endif
48
49	static const long Cryptography_HAS_DTLS = 1;
50	-