Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove NPN bindings -- you should be using ALPN! #4765

Merged
merged 5 commits into from
Jul 6, 2020
Merged

remove NPN bindings -- you should be using ALPN! #4765

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ac2df0
remove NPN bindings -- you should be using ALPN!
reaperhulk Feb 25, 2019
e92d9c5
set Cryptography_HAS_NEXTPROTONEG to 0 for pyOpenSSL
reaperhulk Feb 25, 2019
e1777f4
remove another NPN related definition
reaperhulk Feb 25, 2019
1f256ba
suspicious
reaperhulk May 20, 2019
c1352fc
Revert "remove another NPN related definition"
reaperhulk Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/_cffi_src/openssl/ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@
static const long TLS_ST_BEFORE;
static const long TLS_ST_OK;

static const long OPENSSL_NPN_NEGOTIATED;

typedef ... SSL_METHOD;
typedef ... SSL_CTX;

Expand Down Expand Up @@ -440,25 +438,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);
Expand Down Expand Up @@ -665,7 +647,7 @@
static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 1;
static const long Cryptography_HAS_SSL_OP_NO_TICKET = 1;
static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1;
static const long Cryptography_HAS_NEXTPROTONEG = 1;
static const long Cryptography_HAS_NEXTPROTONEG = 0;
static const long Cryptography_HAS_ALPN = 1;

#if CRYPTOGRAPHY_IS_LIBRESSL
Expand Down