diff options
| author | Zandra Hird <[email protected]> | 2015-03-19 10:36:00 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-19 10:36:17 +0100 |
| commit | 2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch) | |
| tree | c66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/ssl/test/ssl_npn_handshake_SUITE.erl | |
| parent | 8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff) | |
| parent | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff) | |
| download | otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2 otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip | |
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn:
ssl: Add TLS-ALPN support
OTP-12580
Diffstat (limited to 'lib/ssl/test/ssl_npn_handshake_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_npn_handshake_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl index 30c0a67a36..326f907e66 100644 --- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl @@ -172,7 +172,7 @@ no_client_negotiate_but_server_supports_npn(Config) when is_list(Config) -> run_npn_handshake(Config, [], [{next_protocols_advertised, [<<"spdy/1">>, <<"http/1.1">>, <<"http/1.0">>]}], - {error, next_protocol_not_negotiated}). + {error, protocol_not_negotiated}). %-------------------------------------------------------------------------------- @@ -180,7 +180,7 @@ client_negotiate_server_does_not_support(Config) when is_list(Config) -> run_npn_handshake(Config, [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}], [], - {error, next_protocol_not_negotiated}). + {error, protocol_not_negotiated}). %-------------------------------------------------------------------------------- renegotiate_from_client_after_npn_handshake(Config) when is_list(Config) -> @@ -311,8 +311,8 @@ run_npn_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) -> assert_npn(Socket, Protocol) -> ct:log("Negotiated Protocol ~p, Expecting: ~p ~n", - [ssl:negotiated_next_protocol(Socket), Protocol]), - Protocol = ssl:negotiated_next_protocol(Socket). + [ssl:negotiated_protocol(Socket), Protocol]), + Protocol = ssl:negotiated_protocol(Socket). assert_npn_and_renegotiate_and_send_data(Socket, Protocol, Data) -> assert_npn(Socket, Protocol), |