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.c | |
| parent | f18ce934889a36db42b7988e8acca9ac4f23299f (diff) | |
| download | openssl-817cd0d52f0462039d1fe60462150be7f59d2002.tar.gz | |
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.c')
| -rw-r--r-- | apps/apps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c index 19523d68fc..4e2322d7a7 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1960,7 +1960,7 @@ void policies_print(X509_STORE_CTX *ctx) * * returns: a malloced buffer or NULL on failure. */ -unsigned char *next_protos_parse(unsigned short *outlen, const char *in) +unsigned char *next_protos_parse(size_t *outlen, const char *in) { size_t len; unsigned char *out; |