diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-26 09:26:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-26 09:26:51 +0100 |
| commit | e33a2eb094416740e4862dcbb6e6e118f50a41d2 (patch) | |
| tree | ccf8dc646dbe2b0239f6ba2101886a0b08648e88 /lib/ssl/test | |
| parent | 4057cf67d8f4c42992efc61790225d394a8709a2 (diff) | |
| parent | d18e7b25a17a0c62c0beddc81f23b1dea18b7ef4 (diff) | |
| download | otp-e33a2eb094416740e4862dcbb6e6e118f50a41d2.tar.gz otp-e33a2eb094416740e4862dcbb6e6e118f50a41d2.tar.bz2 otp-e33a2eb094416740e4862dcbb6e6e118f50a41d2.zip | |
Merge branch 'ia/ssl/sni-alert/OTP-11815'
* ia/ssl/sni-alert/OTP-11815:
ssl: Handle SNI alert unrecognized_name and gracefully deal with unexpected alerts.
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 64a93440c7..0148e1f5bc 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -309,7 +309,11 @@ alerts(Config) when is_list(Config) -> ?ILLEGAL_PARAMETER, ?UNKNOWN_CA, ?ACCESS_DENIED, ?DECODE_ERROR, ?DECRYPT_ERROR, ?EXPORT_RESTRICTION, ?PROTOCOL_VERSION, ?INSUFFICIENT_SECURITY, ?INTERNAL_ERROR, ?USER_CANCELED, - ?NO_RENEGOTIATION], + ?NO_RENEGOTIATION, ?UNSUPPORTED_EXTENSION, ?CERTIFICATE_UNOBTAINABLE, + ?UNRECOGNISED_NAME, ?BAD_CERTIFICATE_STATUS_RESPONSE, + ?BAD_CERTIFICATE_HASH_VALUE, ?UNKNOWN_PSK_IDENTITY, + 255 %% Unsupported/unknow alert will result in a description too + ], Alerts = [?ALERT_REC(?WARNING, ?CLOSE_NOTIFY) | [?ALERT_REC(?FATAL, Desc) || Desc <- Descriptions]], lists:foreach(fun(Alert) -> |