diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
| commit | c4ba2c49508a02f2eef9624b06a9b91583e70e2c (patch) | |
| tree | 679f594f5559314a888c15f3b82118c97ddb42fd /lib/public_key/src/pubkey_cert.erl | |
| parent | e243040fabd2701995cc4565250674d972403db2 (diff) | |
| parent | fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f (diff) | |
| download | otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.gz otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.bz2 otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.zip | |
Merge branch 'ia/public_key/encode-decode-ssh/OTP-9144' into dev
* ia/public_key/encode-decode-ssh/OTP-9144:
Implemented encode/decode support for ssh public key files
Diffstat (limited to 'lib/public_key/src/pubkey_cert.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index fadb993ed9..5ab9642279 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -38,7 +38,7 @@ %%==================================================================== %%-------------------------------------------------------------------- --spec verify_data(der_encoded()) -> {md5 | sha, binary(), binary()}. +-spec verify_data(DER::binary()) -> {md5 | sha, binary(), binary()}. %% %% Description: Extracts data from DerCert needed to call public_key:verify/4. %%-------------------------------------------------------------------- @@ -146,7 +146,7 @@ validate_issuer(OtpCert, Issuer, UserState, VerifyFun) -> verify_fun(OtpCert, {bad_cert, invalid_issuer}, UserState, VerifyFun) end. %%-------------------------------------------------------------------- --spec validate_signature(#'OTPCertificate'{}, der_encoded(), +-spec validate_signature(#'OTPCertificate'{}, DER::binary(), term(),term(), term(), fun()) -> term(). %% |