diff options
author | jsing <> | 2017-08-12 21:03:08 +0000 |
---|---|---|
committer | jsing <> | 2017-08-12 21:03:08 +0000 |
commit | c648197458d45db4f93561e9497fac0532e6d0bc (patch) | |
tree | 942d907ed1f094ec2a23893a790715396a4d7e4f /src/lib/libssl/man | |
parent | be646f37c6508ed75a22ff21af60f2496b432c9d (diff) | |
download | openbsd-c648197458d45db4f93561e9497fac0532e6d0bc.tar.gz openbsd-c648197458d45db4f93561e9497fac0532e6d0bc.tar.bz2 openbsd-c648197458d45db4f93561e9497fac0532e6d0bc.zip |
Remove NPN support.
NPN was never standardised and the last draft expired in October 2012.
ALPN was standardised in July 2014 and has been supported in LibreSSL
since December 2014. NPN has also been removed from Chromium in May 2016.
TLS clients and servers that try to use/enable NPN will fail gracefully and
fallback to the default protocol, since it will essentially appear that the
otherside does not support NPN. At some point in the future we will
actually remove the NPN related symbols entirely.
ok bcook@ beck@ doug@
Diffstat (limited to 'src/lib/libssl/man')
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 b/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 index ea7b1faf48..eb6c543478 100644 --- a/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 +++ b/src/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.2 2017/06/10 13:58:59 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_set_alpn_select_cb.3,v 1.3 2017/08/12 21:03:08 jsing Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Todd Short <tshort@akamai.com>. | 4 | .\" This file was written by Todd Short <tshort@akamai.com>. |
@@ -48,7 +48,7 @@ | |||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
50 | .\" | 50 | .\" |
51 | .Dd $Mdocdate: June 10 2017 $ | 51 | .Dd $Mdocdate: August 12 2017 $ |
52 | .Dt SSL_CTX_SET_ALPN_SELECT_CB 3 | 52 | .Dt SSL_CTX_SET_ALPN_SELECT_CB 3 |
53 | .Os | 53 | .Os |
54 | .Sh NAME | 54 | .Sh NAME |
@@ -181,7 +181,6 @@ If no match is found, the first item in | |||
181 | is returned in | 181 | is returned in |
182 | .Fa out , | 182 | .Fa out , |
183 | .Fa outlen . | 183 | .Fa outlen . |
184 | This function can also be used in the NPN callback. | ||
185 | .Pp | 184 | .Pp |
186 | .Fn SSL_get0_alpn_selected | 185 | .Fn SSL_get0_alpn_selected |
187 | returns a pointer to the selected protocol in | 186 | returns a pointer to the selected protocol in |