diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-04-04 09:46:45 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-04-04 09:46:45 +0200 |
| commit | 8e79ce54b35d207f27e0b29ab09808aa45078e73 (patch) | |
| tree | 582b828d148e3657195abcf163b81e90ac82290e /lib/ssl/src/ssl_alert.erl | |
| parent | ae295fdfcae3c51441d4f456a2180a72e2408f52 (diff) | |
| parent | b8e72765305590eb7c89166ce261843d54c9bcde (diff) | |
| download | otp-8e79ce54b35d207f27e0b29ab09808aa45078e73.tar.gz otp-8e79ce54b35d207f27e0b29ab09808aa45078e73.tar.bz2 otp-8e79ce54b35d207f27e0b29ab09808aa45078e73.zip | |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/ssl_alert.erl')
| -rw-r--r-- | lib/ssl/src/ssl_alert.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl index 94e95d3cd3..1810043dfb 100644 --- a/lib/ssl/src/ssl_alert.erl +++ b/lib/ssl/src/ssl_alert.erl @@ -112,4 +112,6 @@ description_txt(?INTERNAL_ERROR) -> description_txt(?USER_CANCELED) -> "user canceled"; description_txt(?NO_RENEGOTIATION) -> - "no renegotiation". + "no renegotiation"; +description_txt(?UNKNOWN_PSK_IDENTITY) -> + "unknown psk identity". |