-
Notifications
You must be signed in to change notification settings - Fork 759
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
security/py-cryptography: Update to 0.7.2, Fix LibreSSL
- Update to 0.7.2 - Update BUILD_DEPENDS and TEST_DEPENDS - Patch upstream sources to fix LibreSSL: * Remove EGD (Perl Entropy Gathering Daemon) support. This hasn't been needed on FreeBSD since FreeBSD 4.2 * Disable compression conditionally using OPENSSL_NO_COMP * Check features, not version for x509_vfy [1] pyca/cryptography#928 PR: 196827 Submitted by: Bernard Spil <spil.oss gmail com> git-svn-id: svn+ssh://svn.freebsd.org/ports/head@377287 35697150-7ecd-e111-bb59-0022644237b5
- Loading branch information
koobs
committed
Jan 18, 2015
1 parent
2e7de41
commit e8e27f7
Showing
6 changed files
with
87 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
SHA256 (cryptography-0.5.4.tar.gz) = 5675999f3744cbc32a60cb0bba64de21405abced32ce19655212612262dd270d | ||
SIZE (cryptography-0.5.4.tar.gz) = 320104 | ||
SHA256 (cryptography-0.7.2.tar.gz) = fab7fcdde360ec6614442d0321dcd0eff5e43544cb30d975e9d75a914a4cdf78 | ||
SIZE (cryptography-0.7.2.tar.gz) = 247477 |
10 changes: 10 additions & 0 deletions
10
security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_engine.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- 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); | ||
-void ENGINE_load_cryptodev(void); | ||
void ENGINE_load_builtin_engines(void); | ||
void ENGINE_cleanup(void); | ||
ENGINE *ENGINE_get_default_RSA(void); |
12 changes: 12 additions & 0 deletions
12
security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_rand.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- 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); | ||
-int RAND_egd(const char *); | ||
-int RAND_egd_bytes(const char *, int); | ||
-int RAND_query_egd_bytes(const char *, unsigned char *, int); | ||
const char *RAND_file_name(char *, size_t); | ||
int RAND_load_file(const char *, long); | ||
int RAND_write_file(const char *); |
30 changes: 30 additions & 0 deletions
30
security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_ssl.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
--- 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 *); | ||
|
||
-const COMP_METHOD *SSL_get_current_compression(SSL *); | ||
-const COMP_METHOD *SSL_get_current_expansion(SSL *); | ||
-const char *SSL_COMP_get_name(const COMP_METHOD *); | ||
- | ||
/* context */ | ||
void SSL_CTX_free(SSL_CTX *); | ||
long SSL_CTX_set_timeout(SSL_CTX *, long); | ||
@@ -415,6 +411,16 @@ static const long Cryptography_HAS_RELEA | ||
const long SSL_MODE_RELEASE_BUFFERS = 0; | ||
#endif | ||
|
||
+#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 |
20 changes: 20 additions & 0 deletions
20
security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_x509__vfy.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- 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 | ||
+#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 @@ static const long X509_V_ERR_IP_ADDRESS_ | ||
#endif | ||
|
||
/* OpenSSL 1.0.2+ verification parameters */ | ||
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L | ||
+#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; |