diff options
| author | Henrik Nord <[email protected]> | 2016-02-25 10:53:22 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-02-25 10:53:22 +0100 |
| commit | 6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae (patch) | |
| tree | c16a12f8f04d69cf8b6c8d30c76bec93e32004a3 /lib/ssl/src/ssl_handshake.erl | |
| parent | 209804f87fa7a11468e5e373217917d2e11fcb9d (diff) | |
| parent | 9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf (diff) | |
| download | otp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.tar.gz otp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.tar.bz2 otp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index e9e140836b..e98073080a 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -2072,12 +2072,9 @@ crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _) - ], case dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) of no_dps -> - case dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) of - [] -> - valid; %% No relevant CRL existed - DpsAndCRls -> - crl_check_same_issuer(OtpCert, Check, DpsAndCRls, Options) - end; + crl_check_same_issuer(OtpCert, Check, + dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer), + Options); DpsAndCRLs -> %% This DP list may be empty if relevant CRLs existed %% but could not be retrived, will result in {bad_cert, revocation_status_undetermined} case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of |