diff options
| author | jkim <jkim@FreeBSD.org> | 2014-10-15 19:12:05 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-10-15 19:12:05 +0000 |
| commit | 411d431d45a87a859fd5507449dc4529d6ee1c08 (patch) | |
| tree | c23fa858f36ae42eb7fe9898b481a136f3f8733b /crypto/openssl/ssl/ssl_err.c | |
| parent | cfb0e0275efcad3cdfca0ae280949467ed709e9f (diff) | |
| parent | 9a02b27a6e11c9667427250a26589d17ad31e847 (diff) | |
| download | FreeBSD-src-411d431d45a87a859fd5507449dc4529d6ee1c08.zip FreeBSD-src-411d431d45a87a859fd5507449dc4529d6ee1c08.tar.gz | |
Merge OpenSSL 1.0.1j.
Diffstat (limited to 'crypto/openssl/ssl/ssl_err.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_err.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_err.c b/crypto/openssl/ssl/ssl_err.c index d2f0dec..1b7eb47 100644 --- a/crypto/openssl/ssl/ssl_err.c +++ b/crypto/openssl/ssl/ssl_err.c @@ -383,6 +383,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {ERR_REASON(SSL_R_HTTPS_PROXY_REQUEST) ,"https proxy request"}, {ERR_REASON(SSL_R_HTTP_REQUEST) ,"http request"}, {ERR_REASON(SSL_R_ILLEGAL_PADDING) ,"illegal padding"}, +{ERR_REASON(SSL_R_INAPPROPRIATE_FALLBACK),"inappropriate fallback"}, {ERR_REASON(SSL_R_INCONSISTENT_COMPRESSION),"inconsistent compression"}, {ERR_REASON(SSL_R_INVALID_CHALLENGE_LENGTH),"invalid challenge length"}, {ERR_REASON(SSL_R_INVALID_COMMAND) ,"invalid command"}, @@ -529,6 +530,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),"tlsv1 alert decryption failed"}, {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR),"tlsv1 alert decrypt error"}, {ERR_REASON(SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),"tlsv1 alert export restriction"}, +{ERR_REASON(SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),"tlsv1 alert inappropriate fallback"}, {ERR_REASON(SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),"tlsv1 alert insufficient security"}, {ERR_REASON(SSL_R_TLSV1_ALERT_INTERNAL_ERROR),"tlsv1 alert internal error"}, {ERR_REASON(SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),"tlsv1 alert no renegotiation"}, |
