View | Details | Raw Unified | Return to bug 197049 | Differences between
and this patch

Collapse All | Expand All

(-)src/cryptography/hazmat/bindings/openssl/ssl.py (-5 / +11 lines)
Lines 189-198 int SSL_shutdown(SSL *); Link Here
189
const char *SSL_get_cipher_list(const SSL *, int);
189
const char *SSL_get_cipher_list(const SSL *, int);
190
Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
190
Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
191
191
192
const COMP_METHOD *SSL_get_current_compression(SSL *);
193
const COMP_METHOD *SSL_get_current_expansion(SSL *);
194
const char *SSL_COMP_get_name(const COMP_METHOD *);
195
196
/*  context */
192
/*  context */
197
void SSL_CTX_free(SSL_CTX *);
193
void SSL_CTX_free(SSL_CTX *);
198
long SSL_CTX_set_timeout(SSL_CTX *, long);
194
long SSL_CTX_set_timeout(SSL_CTX *, long);
Lines 415-420 static const long Cryptography_HAS_RELEA Link Here
415
const long SSL_MODE_RELEASE_BUFFERS = 0;
411
const long SSL_MODE_RELEASE_BUFFERS = 0;
416
#endif
412
#endif
417
413
414
#ifndef OPENSSL_NO_COMP
415
const COMP_METHOD *SSL_get_current_compression(SSL *s);
416
const COMP_METHOD *SSL_get_current_expansion(SSL *s);
417
const char *SSL_COMP_get_name(const COMP_METHOD *comp);
418
#else
419
const void *SSL_get_current_compression(SSL *s);
420
const void *SSL_get_current_expansion(SSL *s);
421
const char *SSL_COMP_get_name(const void *comp);
422
#endif
423
418
#ifdef SSL_OP_NO_COMPRESSION
424
#ifdef SSL_OP_NO_COMPRESSION
419
static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;
425
static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;
420
#else
426
#else
Lines 524-530 Link Here
524
#endif
530
#endif
525
531
526
/* ALPN was added in OpenSSL 1.0.2. */
532
/* ALPN was added in OpenSSL 1.0.2. */
527
#if OPENSSL_VERSION_NUMBER < 0x10002001L
533
#if OPENSSL_VERSION_NUMBER < 0x10002001l && !defined (LIBRESSL_VERSION_NUMBER)
528
int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
534
int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
529
                               const unsigned char *,
535
                               const unsigned char *,
530
                               unsigned) = NULL;
536
                               unsigned) = NULL;

Return to bug 197049