diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:16:13 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:16:13 +0800 |
| commit | 4b305c5721f68e39320ca2e15b03a411da2305f1 (patch) | |
| tree | 5b1698939cf893223f14cec77ed446f28a7d921a /libtomcrypt/src/ciphers/des.c | |
| parent | 615885be01188e433cf931e2f7f85394fdc31c5d (diff) | |
Merge libtomcrypt v1.18.2
Diffstat (limited to 'libtomcrypt/src/ciphers/des.c')
| -rw-r--r-- | libtomcrypt/src/ciphers/des.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libtomcrypt/src/ciphers/des.c b/libtomcrypt/src/ciphers/des.c index fe429cc..fc8faae 100644 --- a/libtomcrypt/src/ciphers/des.c +++ b/libtomcrypt/src/ciphers/des.c @@ -38,7 +38,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, @@ -2080,8 +2080,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; |