aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-05-14 19:09:58 +0200
committerIngela Anderton Andin <[email protected]>2013-05-20 08:41:53 +0200
commitc97744adbe5a80ed802c5dc4e89441fbbee4320b (patch)
tree8dccb6bbe653ea1f668c651cbc2d3f99b8b409a8
parentf941576f751fbf59049d982ca901cd3eab7dfe1f (diff)
downloadotp-c97744adbe5a80ed802c5dc4e89441fbbee4320b.tar.gz
otp-c97744adbe5a80ed802c5dc4e89441fbbee4320b.tar.bz2
otp-c97744adbe5a80ed802c5dc4e89441fbbee4320b.zip
crypto: Change argument order of crypto:next_iv/3
to harmonize with next_iv/2
-rw-r--r--lib/crypto/src/crypto.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 4cfa8415b4..ecb9f6a93e 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -781,10 +781,12 @@ next_iv(des3_cbc, Data) ->
next_iv(aes_cbc, Data) ->
aes_cbc_ivec(Data).
--spec next_iv(des_cbf, Ivec::binary(), Data::iodata()) -> binary().
+-spec next_iv(des_cfb, Data::iodata(), Ivec::binary()) -> binary().
-next_iv(des_cbf, Ivec, Data) ->
- des_cfb_ivec(Ivec, Data).
+next_iv(des_cfb, Data, Ivec) ->
+ des_cfb_ivec(Ivec, Data);
+next_iv(Type, Data, _Ivec) ->
+ next_iv(Type, Data).
stream_init(aes_ctr, Key, Ivec) ->
{aes_ctr, aes_ctr_stream_init(Key, Ivec)}.