aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasufell <hasufell@hasufell.de>2015-01-23 18:49:55 +0100
committerhasufell <hasufell@hasufell.de>2015-01-23 18:49:55 +0100
commit1ae268d7965e9233b15336b4a748c28ed15b7aa2 (patch)
tree41fb9db1f877bbebe8ff3a732e26578814081413 /dev-python
parentnet-misc/wget: use upstream provided patch (diff)
downloadlibressl-1ae268d7965e9233b15336b4a748c28ed15b7aa2.tar.gz
libressl-1ae268d7965e9233b15336b4a748c28ed15b7aa2.tar.bz2
libressl-1ae268d7965e9233b15336b4a748c28ed15b7aa2.zip
dev-python/cryptography: fix build against libressl-2.1.3 wrt #57
This patches are taken from https://github.com/Sp1l/ports/tree/master/security/py-cryptography wrt #54.
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cryptography/files/0.7-libressl.patch64
1 files changed, 30 insertions, 34 deletions
diff --git a/dev-python/cryptography/files/0.7-libressl.patch b/dev-python/cryptography/files/0.7-libressl.patch
index ddc1c09..b82f5b7 100644
--- a/dev-python/cryptography/files/0.7-libressl.patch
+++ b/dev-python/cryptography/files/0.7-libressl.patch
@@ -1,7 +1,6 @@
-diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/engine.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/engine.py
---- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/engine.py 2014-12-28 17:46:47.000000000 -0800
-+++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/engine.py 2015-01-13 19:28:36.480028680 -0800
-@@ -49,7 +49,6 @@
+--- src/cryptography/hazmat/bindings/openssl/engine.py.orig 2015-01-16 13:26:59 UTC
++++ src/cryptography/hazmat/bindings/openssl/engine.py
+@@ -49,7 +49,6 @@ int ENGINE_init(ENGINE *);
int ENGINE_finish(ENGINE *);
void ENGINE_load_openssl(void);
void ENGINE_load_dynamic(void);
@@ -9,10 +8,9 @@ diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/engi
void ENGINE_load_builtin_engines(void);
void ENGINE_cleanup(void);
ENGINE *ENGINE_get_default_RSA(void);
-diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/rand.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/rand.py
---- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/rand.py 2014-12-28 17:46:47.000000000 -0800
-+++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/rand.py 2015-01-13 19:28:46.573362313 -0800
-@@ -16,9 +16,6 @@
+--- src/cryptography/hazmat/bindings/openssl/rand.py.orig 2015-01-16 13:26:59 UTC
++++ src/cryptography/hazmat/bindings/openssl/rand.py
+@@ -16,9 +16,6 @@ void ERR_load_RAND_strings(void);
void RAND_seed(const void *, int);
void RAND_add(const void *, int, double);
int RAND_status(void);
@@ -22,18 +20,9 @@ diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/rand
const char *RAND_file_name(char *, size_t);
int RAND_load_file(const char *, long);
int RAND_write_file(const char *);
-diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/ssl.py
---- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py 2014-12-28 17:46:47.000000000 -0800
-+++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/ssl.py 2015-01-13 19:30:40.533365704 -0800
-@@ -149,7 +149,6 @@
-
- typedef ... SSL_CIPHER;
- typedef ... Cryptography_STACK_OF_SSL_CIPHER;
--typedef ... COMP_METHOD;
- """
-
- FUNCTIONS = """
-@@ -189,10 +188,6 @@
+--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig 2015-01-16 13:26:59 UTC
++++ src/cryptography/hazmat/bindings/openssl/ssl.py
+@@ -189,10 +189,6 @@ int SSL_shutdown(SSL *);
const char *SSL_get_cipher_list(const SSL *, int);
Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
@@ -44,33 +33,40 @@ diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.
/* context */
void SSL_CTX_free(SSL_CTX *);
long SSL_CTX_set_timeout(SSL_CTX *, long);
-@@ -523,7 +518,7 @@
+@@ -415,6 +411,16 @@ static const long Cryptography_HAS_RELEA
+ const long SSL_MODE_RELEASE_BUFFERS = 0;
#endif
- /* ALPN was added in OpenSSL 1.0.2. */
--#if OPENSSL_VERSION_NUMBER < 0x10002001L
-+#if OPENSSL_VERSION_NUMBER < 0x10002001L || OPENSSL_VERSION_NUMBER >= 0x20000000L
- int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
- const unsigned char *,
- unsigned) = NULL;
-diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/x509_vfy.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/x509_vfy.py
---- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/x509_vfy.py 2014-12-28 17:46:47.000000000 -0800
-+++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/x509_vfy.py 2015-01-13 19:32:30.456702318 -0800
-@@ -191,7 +191,7 @@
++#ifndef OPENSSL_NO_COMP
++const COMP_METHOD *SSL_get_current_compression(SSL *s);
++const COMP_METHOD *SSL_get_current_expansion(SSL *s);
++const char *SSL_COMP_get_name(const COMP_METHOD *comp);
++#else
++const void *SSL_get_current_compression(SSL *s);
++const void *SSL_get_current_expansion(SSL *s);
++const char *SSL_COMP_get_name(const void *comp);
++#endif
++
+ #ifdef SSL_OP_NO_COMPRESSION
+ static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;
+ #else
+--- src/cryptography/hazmat/bindings/openssl/x509_vfy.py.orig 2015-01-16 13:26:59 UTC
++++ src/cryptography/hazmat/bindings/openssl/x509_vfy.py
+@@ -191,7 +191,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_V
CUSTOMIZATIONS = """
/* OpenSSL 1.0.2+ verification error codes */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#ifdef X509_V_ERR_EMAIL_MISMATCH
++#if X509_V_ERR_EMAIL_MISMATCH
static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;
#else
static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ static const long X509_V_ERR_IP_ADDRESS_
#endif
/* OpenSSL 1.0.2+ verification parameters */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#ifdef X509_V_FLAG_PARTIAL_CHAIN
++#if X509_V_FLAG_PARTIAL_CHAIN
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
#else
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;