FreeBSD Bugzilla – Attachment 152098 Details for
Bug 197049
security/py-cryptography fix build failure with LibreSSL
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn diff against ports/head
patch-src_cryptography_hazmat_bindings_openssl_ssl.py (text/plain), 1.43 KB, created by
Bernard Spil
on 2015-01-24 13:58:57 UTC
(
hide
)
Description:
svn diff against ports/head
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2015-01-24 13:58:57 UTC
Size:
1.43 KB
patch
obsolete
>--- 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 >@@ -524,7 +530,7 @@ > #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;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 197049
:
152098
|
152271
|
155602
|
155603
|
155798
|
155799