08599312d4
Upstream backport. It seems the holdup is on python-twisted. Without this, it fails with SSL_get0_next_proto_negotiated: symbol not found Signed-off-by: Rosen Penev <rosenp@gmail.com>
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From eec1f066476eccf7135af0a4cfef9e1c883795b3 Mon Sep 17 00:00:00 2001
|
|
From: Paul Kehrer <paul.l.kehrer@gmail.com>
|
|
Date: Mon, 25 Feb 2019 10:55:16 +0800
|
|
Subject: [PATCH] remove NPN bindings -- you should be using ALPN!
|
|
|
|
pyOpenSSL consumed these, but we've marked it as deprecated and it
|
|
already handles the case where the bindings are not available.
|
|
---
|
|
src/_cffi_src/openssl/ssl.py | 16 ----------------
|
|
1 file changed, 16 deletions(-)
|
|
|
|
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
|
|
index da21f3ce90..0e8610f988 100644
|
|
--- a/src/_cffi_src/openssl/ssl.py
|
|
+++ b/src/_cffi_src/openssl/ssl.py
|
|
@@ -431,25 +431,9 @@
|
|
|
|
long SSL_session_reused(SSL *);
|
|
|
|
-void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *,
|
|
- int (*)(SSL *,
|
|
- const unsigned char **,
|
|
- unsigned int *,
|
|
- void *),
|
|
- void *);
|
|
-void SSL_CTX_set_next_proto_select_cb(SSL_CTX *,
|
|
- int (*)(SSL *,
|
|
- unsigned char **,
|
|
- unsigned char *,
|
|
- const unsigned char *,
|
|
- unsigned int,
|
|
- void *),
|
|
- void *);
|
|
int SSL_select_next_proto(unsigned char **, unsigned char *,
|
|
const unsigned char *, unsigned int,
|
|
const unsigned char *, unsigned int);
|
|
-void SSL_get0_next_proto_negotiated(const SSL *,
|
|
- const unsigned char **, unsigned *);
|
|
|
|
int sk_SSL_CIPHER_num(Cryptography_STACK_OF_SSL_CIPHER *);
|
|
const SSL_CIPHER *sk_SSL_CIPHER_value(Cryptography_STACK_OF_SSL_CIPHER *, int);
|