aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/c_src/crypto.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-08-15 20:45:47 +0200
committerSverker Eriksson <[email protected]>2012-08-15 20:45:47 +0200
commit125f494f3a0e31502d209fd050d16f47b9d417da (patch)
tree7bf1913838039690236b84e2b49ee7e48ea67af8 /lib/crypto/c_src/crypto.c
parentf3c830eddc68d7269d4f48b13ddae40893929573 (diff)
parent6faad239766accdcc007540f0b8b38d4709cd435 (diff)
downloadotp-125f494f3a0e31502d209fd050d16f47b9d417da.tar.gz
otp-125f494f3a0e31502d209fd050d16f47b9d417da.tar.bz2
otp-125f494f3a0e31502d209fd050d16f47b9d417da.zip
Merge branch 'sverk/crypto-unaligned-aes-cfb/OTP-10136' into maint
* sverk/crypto-unaligned-aes-cfb/OTP-10136: crypto: Allow aes_cfb_128_{en|de}crypt to accept unaligned data
Diffstat (limited to 'lib/crypto/c_src/crypto.c')
-rw-r--r--lib/crypto/c_src/crypto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 4be593e208..a6a81d6fe2 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -954,8 +954,7 @@ static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 16
|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
- || !enif_inspect_iolist_as_binary(env, argv[2], &text)
- || text.size % 16 != 0) {
+ || !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
return enif_make_badarg(env);
}