diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-08-29 10:20:59 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-08-29 10:20:59 +0200 |
| commit | 5eb2fc98461fde051c488760f1c89cf93e5b0f78 (patch) | |
| tree | e1cd3581ddf5960a1f626ae99943989bc36b900c /lib/public_key/src/pubkey_pem.erl | |
| parent | e59ea3efb5eafcda94fec0f838f2062db47acbcd (diff) | |
| parent | df16aab42131b391cfae9fb65cdfe54293b0b67a (diff) | |
| download | otp-5eb2fc98461fde051c488760f1c89cf93e5b0f78.tar.gz otp-5eb2fc98461fde051c488760f1c89cf93e5b0f78.tar.bz2 otp-5eb2fc98461fde051c488760f1c89cf93e5b0f78.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/public_key/src/pubkey_pem.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_pem.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index 8d2e97ad77..98881c4a6a 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -68,7 +68,8 @@ encode(PemEntries) -> %%-------------------------------------------------------------------- -spec decipher({public_key:pki_asn1_type(), DerEncrypted::binary(), - {Cipher :: string(), Salt :: iodata() | #'PBES2-params'{}}}, + {Cipher :: string(), Salt :: iodata() | #'PBES2-params'{} + | {#'PBEParameter'{}, atom()}}}, string()) -> Der::binary(). %% %% Description: Deciphers a decrypted pem entry. @@ -77,7 +78,8 @@ decipher({_, DecryptDer, {Cipher, KeyDevParams}}, Password) -> pubkey_pbe:decode(DecryptDer, Password, Cipher, KeyDevParams). %%-------------------------------------------------------------------- --spec cipher(Der::binary(), {Cipher :: string(), Salt :: iodata() | #'PBES2-params'{}} , +-spec cipher(Der::binary(), {Cipher :: string(), Salt :: iodata() | #'PBES2-params'{} + | {#'PBEParameter'{}, atom()}}, string()) -> binary(). %% %% Description: Ciphers a PEM entry |