diff options
author | delphij <delphij@FreeBSD.org> | 2014-10-21 19:00:32 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-10-21 19:00:32 +0000 |
commit | c8355117f700e2cffc517edc3f7521665c326fca (patch) | |
tree | f68eb5a329ab50a208c89c53df494041b1c620db /crypto/openssl/ssl/s3_enc.c | |
parent | a9539c532afcf2cba8c34cf3b9261be4fdeb9cd4 (diff) | |
download | FreeBSD-src-c8355117f700e2cffc517edc3f7521665c326fca.zip FreeBSD-src-c8355117f700e2cffc517edc3f7521665c326fca.tar.gz |
MFS r273149 (jkim): MFC: r273144, r273146
Merge OpenSSL 1.0.1j.
This is part of an upcoming FreeBSD security advisory.
Approved by: re (so@ blanket)
Diffstat (limited to 'crypto/openssl/ssl/s3_enc.c')
-rw-r--r-- | crypto/openssl/ssl/s3_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_enc.c b/crypto/openssl/ssl/s3_enc.c index 9962677..9db45af 100644 --- a/crypto/openssl/ssl/s3_enc.c +++ b/crypto/openssl/ssl/s3_enc.c @@ -900,7 +900,7 @@ int ssl3_alert_code(int code) case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(SSL3_AD_HANDSHAKE_FAILURE); case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(SSL3_AD_HANDSHAKE_FAILURE); case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); + case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); default: return(-1); } } - |