From 65254f65bf3af41b2eff14ed48384c98fe98b63f Mon Sep 17 00:00:00 2001 From: Patrick Pelletier Date: Wed, 5 Oct 2011 01:34:41 -0700 Subject: [PATCH] Fix camellia_keysize() to not change the keysize if it is correct. It was rounding 32 down to 24, 24 down to 16, and claiming 16 was invalid. --- src/ciphers/camellia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ciphers/camellia.c b/src/ciphers/camellia.c index e7b172f..488998b 100644 --- a/src/ciphers/camellia.c +++ b/src/ciphers/camellia.c @@ -711,9 +711,9 @@ void camellia_done(symmetric_key *skey) {} int camellia_keysize(int *keysize) { - if (*keysize > 32) { *keysize = 32; } - else if (*keysize > 24) { *keysize = 24; } - else if (*keysize > 16) { *keysize = 16; } + if (*keysize >= 32) { *keysize = 32; } + else if (*keysize >= 24) { *keysize = 24; } + else if (*keysize >= 16) { *keysize = 16; } else return CRYPT_INVALID_KEYSIZE; return CRYPT_OK; }