diff options
| author | Henrik Nord <[email protected]> | 2016-02-25 10:52:59 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-02-25 10:52:59 +0100 |
| commit | 9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf (patch) | |
| tree | 6f761b84c94fb23a2f8838a05c0192bd4cfebf51 /lib/ssl/src | |
| parent | 0a66b4b0f4c73e915e4404a284ca659edd6567b4 (diff) | |
| parent | 331afa5dfaa129a5ea41af5dd76246bb922ac7df (diff) | |
| download | otp-9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf.tar.gz otp-9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf.tar.bz2 otp-9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf.zip | |
Merge branch 'legoscia/crl-check-without-dp' into maint
* legoscia/crl-check-without-dp:
Be suspicious of certificates without CRL DPs
Refactor ssl_crl_SUITE: extract crl_verify_error/6
OTP-13378
Diffstat (limited to 'lib/ssl/src')
| -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 |