Attachment #162119 for bug #203819

View | Details | Raw Unified | Return to bug 203819
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptography	4	PORTNAME= cryptography
5	PORTVERSION= 0.8.2	5	PORTVERSION= 1.0.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 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (cryptography-0.8.2.tar.gz) = 1c9a022ab3decaf152093e2ef2d5ee4258c72c7d429446c86bd68ff8c0929db6	1	SHA256 (cryptography-1.0.2.tar.gz) = d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca
2	SIZE (cryptography-0.8.2.tar.gz) = 268288	2	SIZE (cryptography-1.0.2.tar.gz) = 332870




--- src/_cffi_src/openssl/ec.py.orig	2015-09-27 13:51:07 UTC
+++ src/_cffi_src/openssl/ec.py
@@ -396,7 +396,8 @@ EC_GROUP *(*EC_GROUP_new_curve_GF2m)(
 static const long Cryptography_HAS_EC2M = 1;
 #endif
 
-#if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \
+#if defined(OPENSSL_NO_EC) || \
+    OPENSSL_VERSION_NUMBER < 0x1000200f && !defined(LIBRESSL_VERSION_NUMBER) || \
     defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
 static const long Cryptography_HAS_EC_1_0_2 = 0;
 const char *(*EC_curve_nid2nist)(int) = NULL;




From 622409947f6e64fcabbf2b4da2ed086abc06ed85 Mon Sep 17 00:00:00 2001
From: Bernard Spil <Sp1l@users.noreply.github.com>
Date: Wed, 15 Apr 2015 11:09:32 +0200
Subject: [PATCH] LibreSSL added ALPN support in 2.1.3
Link: https://github.com/pyca/cryptography/pull/1849

--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig	2015-04-24 12:57:06 UTC
+++ src/cryptography/hazmat/bindings/openssl/ssl.py
@@ -526,7 +526,7 @@ static const long Cryptography_HAS_NEXTP
 #endif
 
 /* ALPN was added in OpenSSL 1.0.2. */
-#if OPENSSL_VERSION_NUMBER < 0x10002001L
+#if OPENSSL_VERSION_NUMBER < 0x10002001L  && !defined(LIBRESSL_VERSION_NUMBER)
 int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
                                const unsigned char *,
                                unsigned) = NULL;

Return to bug 203819

Line 0 Link Here

(-)files/patch-src___cffi__src_openssl_ec.py (+12 lines)
	1	--- src/_cffi_src/openssl/ec.py.orig 2015-09-27 13:51:07 UTC
	2	+++ src/_cffi_src/openssl/ec.py
	3	@@ -396,7 +396,8 @@ EC_GROUP (EC_GROUP_new_curve_GF2m)(
	4	static const long Cryptography_HAS_EC2M = 1;
	5	#endif
	6
	7	-#if defined(OPENSSL_NO_EC) \|\| OPENSSL_VERSION_NUMBER < 0x1000200f \|\| \
	8	+#if defined(OPENSSL_NO_EC) \|\| \
	9	+ OPENSSL_VERSION_NUMBER < 0x1000200f && !defined(LIBRESSL_VERSION_NUMBER) \|\| \
	10	defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
	11	static const long Cryptography_HAS_EC_1_0_2 = 0;
	12	const char (EC_curve_nid2nist)(int) = NULL;

Lines 1-17 Link Here

(-)files/patch-src_cryptography_hazmat_bindings_openssl_ssl.py (-17 lines)
1	From 622409947f6e64fcabbf2b4da2ed086abc06ed85 Mon Sep 17 00:00:00 2001
2	From: Bernard Spil <Sp1l@users.noreply.github.com>
3	Date: Wed, 15 Apr 2015 11:09:32 +0200
4	Subject: [PATCH] LibreSSL added ALPN support in 2.1.3
5	Link: https://github.com/pyca/cryptography/pull/1849
6
7	--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig 2015-04-24 12:57:06 UTC
8	+++ src/cryptography/hazmat/bindings/openssl/ssl.py
9	@@ -526,7 +526,7 @@ static const long Cryptography_HAS_NEXTP
10	#endif
11
12	/* ALPN was added in OpenSSL 1.0.2. */
13	-#if OPENSSL_VERSION_NUMBER < 0x10002001L
14	+#if OPENSSL_VERSION_NUMBER < 0x10002001L && !defined(LIBRESSL_VERSION_NUMBER)
15	int (SSL_CTX_set_alpn_protos)(SSL_CTX ,
16	const unsigned char *,
17	unsigned) = NULL;