diff options
author | Fredrik Gustafsson <fredrik@erlang.org> | 2013-02-28 09:39:43 +0100 |
---|---|---|
committer | Fredrik Gustafsson <fredrik@erlang.org> | 2013-02-28 09:39:43 +0100 |
commit | db9af15041a88184ffb015b699708017275f8c9e (patch) | |
tree | 0ec0e2f00aea1df6d152fae063b2d79a3a48fa11 /lib/ssl/src/ssl_alert.hrl | |
parent | 715339824e815e15d7ab396e219ef3135392be23 (diff) | |
parent | fe59c116358d8c79525eff4d5d4e9c76be2bb400 (diff) | |
download | erlang-master-pu.tar.gz |
Merge branch 'as/tls-psk-srp-suites-ECC' into master-pumaster-pu
Diffstat (limited to 'lib/ssl/src/ssl_alert.hrl')
-rw-r--r-- | lib/ssl/src/ssl_alert.hrl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_alert.hrl b/lib/ssl/src/ssl_alert.hrl index 92548edab7..2a8a91aefa 100644 --- a/lib/ssl/src/ssl_alert.hrl +++ b/lib/ssl/src/ssl_alert.hrl @@ -60,6 +60,7 @@ %% internal_error(80), %% user_canceled(90), %% no_renegotiation(100), +%% unknown_psk_identity(115), %% (255) %% } AlertDescription; @@ -87,6 +88,7 @@ -define(INTERNAL_ERROR, 80). -define(USER_CANCELED, 90). -define(NO_RENEGOTIATION, 100). +-define(UNKNOWN_PSK_IDENTITY, 115). -define(ALERT_REC(Level,Desc), #alert{level=Level,description=Desc,where={?FILE, ?LINE}}). |