diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 2f0b9df402..d431b175ad 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.133 2017/08/28 17:36:58 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.134 2017/08/30 16:24:21 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,11 +752,17 @@ 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); | ||
755 | 760 | ||
756 | /* NPN support function used by ALPN */ | ||
757 | int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, | 761 | int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, |
758 | const unsigned char *in, unsigned int inlen, const unsigned char *client, | 762 | const unsigned char *in, unsigned int inlen, const unsigned char *client, |
759 | unsigned int client_len); | 763 | unsigned int client_len); |
764 | void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, | ||
765 | unsigned *len); | ||
760 | 766 | ||
761 | #define OPENSSL_NPN_UNSUPPORTED 0 | 767 | #define OPENSSL_NPN_UNSUPPORTED 0 |
762 | #define OPENSSL_NPN_NEGOTIATED 1 | 768 | #define OPENSSL_NPN_NEGOTIATED 1 |