diff options
| author | Lars Thorsen <[email protected]> | 2013-01-21 15:02:39 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2013-01-21 15:02:39 +0100 |
| commit | 873d35647eb91a4a0e98c5047769982189438042 (patch) | |
| tree | d862e3afaa22cb86b84005c4ff25d6a4b11ca679 /lib/public_key/src/public_key.erl | |
| parent | bb65d760aa2281c4a7bb216ec1c858813869759d (diff) | |
| parent | bdcc3a41d5d6ba82bb50850261a352c13104d3fc (diff) | |
| download | otp-873d35647eb91a4a0e98c5047769982189438042.tar.gz otp-873d35647eb91a4a0e98c5047769982189438042.tar.bz2 otp-873d35647eb91a4a0e98c5047769982189438042.zip | |
Merge branch 'master' of super:otp
* 'master' of super:otp:
Fixed specs
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 5686920dd4..9b7d98728f 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -509,7 +509,7 @@ pkix_normalize_name(Issuer) -> %%-------------------------------------------------------------------- -spec pkix_path_validation(Cert::binary()| #'OTPCertificate'{} | atom(), CertChain :: [binary()] , - Options :: proplist:proplist()) -> + Options :: proplists:proplist()) -> {ok, {PublicKeyInfo :: term(), PolicyTree :: term()}} | {error, {bad_cert, Reason :: term()}}. @@ -547,7 +547,7 @@ pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options) %-------------------------------------------------------------------- -spec pkix_crls_validate(#'OTPCertificate'{}, [{DP::#'DistributionPoint'{} ,CRL::#'CertificateList'{}}], - Options :: proplist:proplist()) -> valid | {bad_cert, revocation_status_undetermined} + Options :: proplists:proplist()) -> valid | {bad_cert, revocation_status_undetermined} | {bad_cert, {revoked, crl_reason()}}. %% Description: Performs a basic path validation according to RFC 5280. |