diff options
| author | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
| commit | 756a93ca2064b9e0eba3d82a7bd37aeae0f39be1 (patch) | |
| tree | ffbbbfd2749a522c7b1f70ee4f7b1fa0a5e189f3 /lib/public_key/src/public_key.erl | |
| parent | 48eb259aa2d6c7c5d1ddebbfbcefae5e3dafc49c (diff) | |
| parent | d48eaa0731017e5cdadca0af77ac14cd949b6c67 (diff) | |
| download | otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.gz otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.bz2 otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 2901020e83..33fcce2c44 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -488,9 +488,10 @@ pkix_path_validation(PathErr, [Cert | Chain], Options0) when is_atom(PathErr)-> _:_ -> {error, Reason} end; -pkix_path_validation(TrustedCert, CertChain, Options) when - is_binary(TrustedCert) -> OtpCert = pkix_decode_cert(TrustedCert, - otp), pkix_path_validation(OtpCert, CertChain, Options); +pkix_path_validation(TrustedCert, CertChain, Options) + when is_binary(TrustedCert) -> + OtpCert = pkix_decode_cert(TrustedCert, otp), + pkix_path_validation(OtpCert, CertChain, Options); pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options) when is_list(CertChain), is_list(Options) -> |