From 4c2ae4758e5de13f7b9891297feccdd3e00998e5 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Sat, 5 May 2018 17:59:11 +0200 Subject: [PATCH] fix "two-key 3des"-related things (cherry picked from commit 715103a2038432d93537b0f0419717da4b9ee850) --- src/ciphers/des.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ciphers/des.c b/src/ciphers/des.c index 2866054..f83c010 100644 --- a/src/ciphers/des.c +++ b/src/ciphers/des.c @@ -36,7 +36,7 @@ const struct ltc_cipher_descriptor des3_desc = { "3des", 14, - 24, 24, 8, 16, + 16, 24, 8, 16, &des3_setup, &des3_ecb_encrypt, &des3_ecb_decrypt, @@ -2068,8 +2068,11 @@ int des_keysize(int *keysize) int des3_keysize(int *keysize) { LTC_ARGCHK(keysize != NULL); - if(*keysize < 24) { - return CRYPT_INVALID_KEYSIZE; + if (*keysize < 16) + return CRYPT_INVALID_KEYSIZE; + if (*keysize < 24) { + *keysize = 16; + return CRYPT_OK; } *keysize = 24; return CRYPT_OK;