diff options
| author | Todd Short <tshort@akamai.com> | 2016-03-05 08:47:55 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 09:03:05 -0500 |
| commit | 817cd0d52f0462039d1fe60462150be7f59d2002 (patch) | |
| tree | dd075e91d6add68a3c4f493db1e66cce11c990a9 /apps/apps.h | |
| parent | f18ce934889a36db42b7988e8acca9ac4f23299f (diff) | |
GH787: Fix ALPN
* Perform ALPN after the SNI callback; the SSL_CTX may change due to
that processing
* Add flags to indicate that we actually sent ALPN, to properly error
out if unexpectedly received.
* clean up ssl3_free() no need to explicitly clear when doing memset
* document ALPN functions
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h index 5450def13d..ebf696b81b 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -565,7 +565,7 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, extern char *psk_key; # endif -unsigned char *next_protos_parse(unsigned short *outlen, const char *in); +unsigned char *next_protos_parse(size_t *outlen, const char *in); void print_cert_checks(BIO *bio, X509 *x, const char *checkhost, |