diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-02-10 09:35:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-10 09:35:03 +0100 |
| commit | 1918d8fead3a8d4bfd177f68806db539911ad808 (patch) | |
| tree | 12781f3f4d00ad00519c56f7aa032b9e776ba94d /lib/public_key/src/pubkey_pem.erl | |
| parent | 0cbf6ec7444df2c0441debc6bcd5aba0bbc7104d (diff) | |
| parent | 8588180dce9aa7fffbba8c580d67e857796c6e5d (diff) | |
| download | otp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.gz otp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.bz2 otp-1918d8fead3a8d4bfd177f68806db539911ad808.zip | |
Merge branch 'ia/public_key/specs'
* ia/public_key/specs:
public_key: Export some dialyzer types
Diffstat (limited to 'lib/public_key/src/pubkey_pem.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_pem.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index c0a0de815b..3a1653d989 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. 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 @@ -51,7 +51,7 @@ %%==================================================================== %%-------------------------------------------------------------------- --spec decode(binary()) -> [pem_entry()]. +-spec decode(binary()) -> [public_key:pem_entry()]. %% %% Description: Decodes a PEM binary. %%-------------------------------------------------------------------- @@ -59,7 +59,7 @@ decode(Bin) -> decode_pem_entries(split_bin(Bin), []). %%-------------------------------------------------------------------- --spec encode([pem_entry()]) -> iolist(). +-spec encode([public_key:pem_entry()]) -> iolist(). %% %% Description: Encodes a list of PEM entries. %%-------------------------------------------------------------------- @@ -67,7 +67,7 @@ encode(PemEntries) -> encode_pem_entries(PemEntries). %%-------------------------------------------------------------------- --spec decipher({pki_asn1_type(), DerEncrypted::binary(), +-spec decipher({public_key:pki_asn1_type(), DerEncrypted::binary(), {Cipher :: string(), Salt :: iodata() | #'PBES2-params'{}}}, string()) -> Der::binary(). %% |