aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-11-11 10:46:37 +0100
committerIngela Anderton Andin <[email protected]>2011-11-11 10:50:24 +0100
commit0eeda739555deda1c7db37ae68b324230d3d9be9 (patch)
tree2372327437c6566b63ac0fbe40559b8ce88ed770
parent68e803093b8bf43b39f3090a1b717b850a5e8f4b (diff)
downloadotp-0eeda739555deda1c7db37ae68b324230d3d9be9.tar.gz
otp-0eeda739555deda1c7db37ae68b324230d3d9be9.tar.bz2
otp-0eeda739555deda1c7db37ae68b324230d3d9be9.zip
Add clause for expected input to pubkey:pseudo_random_function/2 when
ASN-1 compiler is fixed.
-rw-r--r--lib/public_key/src/pubkey_pbe.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl
index 77d6943d96..43f6c42f10 100644
--- a/lib/public_key/src/pubkey_pbe.erl
+++ b/lib/public_key/src/pubkey_pbe.erl
@@ -183,6 +183,8 @@ key_derivation_params(#'PBES2-params'{keyDerivationFunc = KeyDerivationFunc,
%% ?'id-hmacWithSHA1, but we need some kind of ASN1-fix for this.
pseudo_random_function(#'PBKDF2-params_prf'{algorithm =
{_,_, _,'id-hmacWithSHA1'}}) ->
+ {fun crypto:sha_mac/3, pseudo_output_length(?'id-hmacWithSHA1')};
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA1'}) ->
{fun crypto:sha_mac/3, pseudo_output_length(?'id-hmacWithSHA1')}.
pseudo_output_length(?'id-hmacWithSHA1') ->