diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-27 12:09:44 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-27 12:09:44 +0200 |
| commit | fe77a98f2e76b8e577df8fc68cb2a68adabc413c (patch) | |
| tree | 7ed1f43c8e6673a7ecae95ad58cbcf27ab3bddb0 | |
| parent | f0324dfcb10cbc34806ba469c997ccecf44b5aa5 (diff) | |
| parent | f1a366fe111bf39478e93062e69626364e91e3a1 (diff) | |
| download | otp-fe77a98f2e76b8e577df8fc68cb2a68adabc413c.tar.gz otp-fe77a98f2e76b8e577df8fc68cb2a68adabc413c.tar.bz2 otp-fe77a98f2e76b8e577df8fc68cb2a68adabc413c.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/public_key/src/pubkey_pbe.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl index e6bcedd1b1..38b5c93521 100644 --- a/lib/public_key/src/pubkey_pbe.erl +++ b/lib/public_key/src/pubkey_pbe.erl @@ -74,7 +74,7 @@ decode(Data, Password,"AES-256-CBC"= Cipher, KeyDevParams) -> %%-------------------------------------------------------------------- --spec pbdkdf1(string(), iodata(), integer(), atom()) -> binary(). +-spec pbdkdf1(iodata(), iodata(), integer(), atom()) -> binary(). %% %% Description: Implements password based decryption key derive function 1. %% Exported mainly for testing purposes. @@ -86,7 +86,7 @@ pbdkdf1(Password, Salt, Count, Hash) -> do_pbdkdf1(Result, Count-1, Result, Hash). %%-------------------------------------------------------------------- --spec pbdkdf2(string(), iodata(), integer(), integer(), fun(), atom(), integer()) +-spec pbdkdf2(iodata(), iodata(), integer(), integer(), fun(), atom(), integer()) -> binary(). %% %% Description: Implements password based decryption key derive function 2. |