GH787: Fix ALPN
authorTodd Short <tshort@akamai.com>
Sat, 5 Mar 2016 13:47:55 +0000 (08:47 -0500)
committerRich Salz <rsalz@openssl.org>
Tue, 8 Mar 2016 14:03:05 +0000 (09:03 -0500)
commit817cd0d52f0462039d1fe60462150be7f59d2002
treedd075e91d6add68a3c4f493db1e66cce11c990a9
parentf18ce934889a36db42b7988e8acca9ac4f23299f
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>
13 files changed:
CHANGES
apps/apps.c
apps/apps.h
apps/s_client.c
apps/s_server.c
doc/ssl/SSL_CTX_set_alpn_select_cb.pod [new file with mode: 0644]
include/openssl/ssl.h
ssl/s3_lib.c
ssl/ssl_lib.c
ssl/ssl_locl.h
ssl/t1_lib.c
test/recipes/80-test_ssl.t
test/ssltest.c