diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-17 15:17:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-17 15:17:43 +0200 |
| commit | c1eb8a0b776634422cd9fe3cf6083d25d5b568d0 (patch) | |
| tree | 786eeebe45746edae1ae5fca3b448e7996d85f8c /lib/public_key | |
| parent | b915bb2da3e5f507439df3ee8e259fb0a9bc424e (diff) | |
| parent | 6a933540f24e76c05cc652acbf2aa92b9ab76d58 (diff) | |
| download | otp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.tar.gz otp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.tar.bz2 otp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.zip | |
Merge branch 'ia/fix-dialyzer-specs' into dev
* ia/fix-dialyzer-specs:
Corrected and added dialyzer specs
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 4 | ||||
| -rw-r--r-- | lib/public_key/src/public_key.erl | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index e704c168f1..c1819e6ddc 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -290,7 +290,7 @@ is_fixed_dh_cert(#'OTPCertificate'{tbsCertificate = %%-------------------------------------------------------------------- --spec verify_fun(#'OTPTBSCertificate'{}, {bad_cert, atom()} | {extension, #'Extension'{}}| +-spec verify_fun(#'OTPCertificate'{}, {bad_cert, atom()} | {extension, #'Extension'{}}| valid, term(), fun()) -> term(). %% %% Description: Gives the user application the opportunity handle path @@ -313,7 +313,7 @@ verify_fun(Otpcert, Result, UserState0, VerifyFun) -> {extension, #'Extension'{critical = true}} -> throw({bad_cert, unknown_critical_extension}); _ -> - UserState + UserState end end. diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 9c7817fa8e..6de5f388dc 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -528,7 +528,6 @@ path_validation([DerCert | _] = Path, {error, Reason} end. - validate(DerCert, #path_validation_state{working_issuer_name = Issuer, working_public_key = Key, working_public_key_parameters = |