diff options
author | Ingela Anderton Andin <[email protected]> | 2015-03-13 15:28:52 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-03-13 15:28:52 +0100 |
commit | d311a090908521f1a9b131c1bd12582d3ef2aaf3 (patch) | |
tree | 97a1486f4093862a0278938acdcb1317f4b944fb /lib/ssl/src/ssl_handshake.erl | |
parent | 0b5ae3e554c7c1220281df138fb0cefb76860427 (diff) | |
parent | b65d8b7ba72a42cfe5df28577433e553d2c0f4ca (diff) | |
download | otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.gz otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.bz2 otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.zip |
Merge branch 'ia/ssl/crls-dialyzer'
* ia/ssl/crls-dialyzer:
ssl: Dialyzer fixes
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
-rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 6cab8eb7a1..5c5f386c6f 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1998,12 +1998,12 @@ crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _) - case dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) of [] -> valid; %% No relevant CRL existed - Dps -> - crl_check_same_issuer(OtpCert, Check, Dps, Options) + DpsAndCRls -> + crl_check_same_issuer(OtpCert, Check, DpsAndCRls, Options) end; - Dps -> %% This DP list may be empty if relevant CRLs existed + 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, Dps, Options) of + case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of {bad_cert, revocation_status_undetermined} -> crl_check_same_issuer(OtpCert, Check, dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer), Options); |