diff options
| author | Loïc Hoguin <[email protected]> | 2015-02-26 18:55:16 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-17 11:55:53 +0100 |
| commit | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (patch) | |
| tree | e2eef9483f32c5616ebe0c5cf91fcb06e0944d87 /lib/stdlib/src/otp_internal.erl | |
| parent | e0c0518a14b747cf02a0e5adfbd5b116a189422d (diff) | |
| download | otp-7cf85926c11d38ce5ebd181f9f98185f359d64a3.tar.gz otp-7cf85926c11d38ce5ebd181f9f98185f359d64a3.tar.bz2 otp-7cf85926c11d38ce5ebd181f9f98185f359d64a3.zip | |
ssl: Add TLS-ALPN support
This commit adds support for RFC7301, application-layer protocol
negotiation. ALPN is the standard based approach to the NPN
extension, and is required for HTTP/2.
ALPN lives side by side with NPN and provides an equivalent
feature but in this case it is the server that decides what
protocol to use, not the client.
When both ALPN and NPN are sent by a client, and the server is
configured with both ALPN and NPN options, ALPN will always
take precedence. This behavior can also be found in the OpenSSL
implementation of ALPN.
ALPN and NPN share the ssl:negotiated_protocol/1 function for
retrieving the negotiated protocol. The previously existing
function ssl:negotiated_next_protocol/1 still exists, but has
been deprecated and removed from the documentation.
The tests against OpenSSL require OpenSSL version 1.0.2+.
Diffstat (limited to 'lib/stdlib/src/otp_internal.erl')
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 4a338798d0..d6afa5e09b 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -590,6 +590,8 @@ obsolete_1(core_lib, is_literal_list, 1) -> " instead"}; obsolete_1(core_lib, literal_value, 1) -> {deprecated,{core_lib,concrete,1}}; +obsolete_1(ssl, negotiated_next_protocol, 1) -> + {deprecated,{ssl,negotiated_protocol}}; obsolete_1(_, _, _) -> no. |