diff options
author | jsing <> | 2017-08-28 17:36:58 +0000 |
---|---|---|
committer | jsing <> | 2017-08-28 17:36:58 +0000 |
commit | 6946bfa953382f8050208e6198d3d6713b681d82 (patch) | |
tree | fd1e6e86b01342a6a9ff433e37ed36471fd5b785 /src/lib/libssl/ssl.h | |
parent | e790d179f0c122ea11b978a15855d1fc9ccc5033 (diff) | |
download | openbsd-6946bfa953382f8050208e6198d3d6713b681d82.tar.gz openbsd-6946bfa953382f8050208e6198d3d6713b681d82.tar.bz2 openbsd-6946bfa953382f8050208e6198d3d6713b681d82.zip |
Completely remove NPN remnants.
Based on a diff from doug@, similar diff from inoguchi@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index a72af19711..2f0b9df402 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.132 2017/08/13 16:28:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.133 2017/08/28 17:36:58 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -752,17 +752,11 @@ void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, | |||
752 | void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, | 752 | void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, |
753 | int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, | 753 | int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, |
754 | unsigned int cookie_len)); | 754 | unsigned int cookie_len)); |
755 | void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb)(SSL *ssl, | ||
756 | const unsigned char **out, unsigned int *outlen, void *arg), void *arg); | ||
757 | void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s, int (*cb)(SSL *ssl, | ||
758 | unsigned char **out, unsigned char *outlen, const unsigned char *in, | ||
759 | unsigned int inlen, void *arg), void *arg); | ||
760 | 755 | ||
756 | /* NPN support function used by ALPN */ | ||
761 | int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, | 757 | int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, |
762 | const unsigned char *in, unsigned int inlen, const unsigned char *client, | 758 | const unsigned char *in, unsigned int inlen, const unsigned char *client, |
763 | unsigned int client_len); | 759 | unsigned int client_len); |
764 | void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, | ||
765 | unsigned *len); | ||
766 | 760 | ||
767 | #define OPENSSL_NPN_UNSUPPORTED 0 | 761 | #define OPENSSL_NPN_UNSUPPORTED 0 |
768 | #define OPENSSL_NPN_NEGOTIATED 1 | 762 | #define OPENSSL_NPN_NEGOTIATED 1 |