From 817cd0d52f0462039d1fe60462150be7f59d2002 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Sat, 5 Mar 2016 08:47:55 -0500 Subject: GH787: Fix ALPN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Reviewed-by: Emilia Käsper --- apps/apps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/apps.c') 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; -- cgit v1.2.3