diff options
author | Todd Short <tshort@akamai.com> | 2016-03-12 09:14:05 -0500 |
---|---|---|
committer | Todd Short <tshort@akamai.com> | 2016-03-20 21:09:32 -0400 |
commit | 0351baae36afe1182237e0bd88ec9d13f5c97f32 (patch) | |
tree | e0eb86c7f9558a24e5a7f6cdc7a3c5aac29cea1e /doc/ssl | |
parent | 89ff989d01314a6104e5063edfce316c8325f339 (diff) |
Fix ALPN - more fixes
* Clear proposed, along with selected, before looking at ClientHello
* Add test case for above
* Clear NPN seen after selecting ALPN on server
* Minor documentation updates
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'doc/ssl')
-rw-r--r-- | doc/ssl/SSL_CTX_set_alpn_select_cb.pod | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/ssl/SSL_CTX_set_alpn_select_cb.pod b/doc/ssl/SSL_CTX_set_alpn_select_cb.pod index 974ca8618b..1a3d92c03a 100644 --- a/doc/ssl/SSL_CTX_set_alpn_select_cb.pod +++ b/doc/ssl/SSL_CTX_set_alpn_select_cb.pod @@ -2,8 +2,8 @@ =head1 NAME -SSL_CTX_set_alpn_select_cb, SSL_CTX_set_alpn_protos, SSL_set_alpn_protos, -SSL_get0_alpn_selected, SSL_select_next_proto - handle application layer +SSL_CTX_set_alpn_protos, SSL_set_alpn_protos, SSL_CTX_set_alpn_select_cb, +SSL_select_next_proto, SSL_get0_alpn_selected - handle application layer protocol negotiation (ALPN) =head1 SYNOPSIS @@ -38,19 +38,19 @@ B<protos_len>. SSL_CTX_set_alpn_select_cb() sets the application callback B<cb> used by a server to select which protocol to use for the incoming connection. When B<cb> -is NULL, no ALPN is not used. The B<arg> value is pointer which is passed to +is NULL, ALPN is not used. The B<arg> value is a pointer which is passed to the application callback. B<cb> is the application defined callback. The B<in>, B<inlen> parameters are a vector in protocol-list format. The value of the B<out>, B<outlen> vector -should be set to the value of a single protocol contained with in the B<in>, +should be set to the value of a single protocol selected from the B<in>, B<inlen> vector. The B<arg> parameter is the pointer set via SSL_CTX_set_alpn_select_cb(). SSL_select_next_proto() is a helper function used to select protocols. It implements the standard protocol selection. It is expected that this function is called from the application callback B<cb>. The protocol data in B<server>, -B<server_len> and B<client>, B<client_len> must be in protocol-list format +B<server_len> and B<client>, B<client_len> must be in the protocol-list format described below. The first item in the B<server>, B<server_len> list that matches an item in the B<client>, B<client_len> list is selected, and returned in B<out>, B<outlen>. The B<out> value will point into either B<server> or @@ -60,7 +60,7 @@ function can also be used in the NPN callback. SSL_get0_alpn_selected() returns a pointer to the selected protocol in B<data> with length B<len>. It is not NUL-terminated. B<data> is set to NULL and B<len> -is set to 0 if no protocol has been selected. B<data> value must not be freed. +is set to 0 if no protocol has been selected. B<data> must not be freed. =head1 NOTES |