forked from pool/libica
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From db1ad6f64d96c6dba2be5af5a4ecd7ceb8f92cf2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Joerg Schmidbauer <jschmidb@de.ibm.com>
|
||
|
|
Date: Wed, 18 Mar 2020 16:48:43 +0100
|
||
|
|
Subject: [PATCH] Fix DES and TDES key length.
|
||
|
|
|
||
|
|
Although a DES key has only 56 effective bits, all 64 bits must be
|
||
|
|
considered, because the parity bits are spread over all 8 bytes of
|
||
|
|
the key.
|
||
|
|
|
||
|
|
Signed-off-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
|
||
|
|
---
|
||
|
|
src/ica_api.c | 8 +++++---
|
||
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/ica_api.c b/src/ica_api.c
|
||
|
|
index b80c6e3..eb6b154 100644
|
||
|
|
--- a/src/ica_api.c
|
||
|
|
+++ b/src/ica_api.c
|
||
|
|
@@ -48,6 +48,8 @@
|
||
|
|
#define DEFAULT2_CRYPT_DEVICE "/dev/z90crypt"
|
||
|
|
#define DEFAULT3_CRYPT_DEVICE "/dev/zcrypt"
|
||
|
|
|
||
|
|
+#define DES_KEY_LEN64 (64/8)
|
||
|
|
+
|
||
|
|
#define MAX_VERSION_LENGTH 16
|
||
|
|
|
||
|
|
int ica_fallbacks_enabled = 1;
|
||
|
|
@@ -125,9 +127,9 @@ static unsigned int check_des_parms(unsigned int mode,
|
||
|
|
|
||
|
|
#ifdef ICA_FIPS
|
||
|
|
static unsigned int fips_check_3des_key(const ica_des_key_triple_t *key) {
|
||
|
|
- if (!CRYPTO_memcmp(key->key1, key->key2, DES_KEY_LENGTH)
|
||
|
|
- | !CRYPTO_memcmp(key->key1, key->key3, DES_KEY_LENGTH)
|
||
|
|
- | !CRYPTO_memcmp(key->key2, key->key3, DES_KEY_LENGTH))
|
||
|
|
+ if (!CRYPTO_memcmp(key->key1, key->key2, DES_KEY_LEN64)
|
||
|
|
+ | !CRYPTO_memcmp(key->key1, key->key3, DES_KEY_LEN64)
|
||
|
|
+ | !CRYPTO_memcmp(key->key2, key->key3, DES_KEY_LEN64))
|
||
|
|
return EINVAL;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
--
|
||
|
|
2.16.4
|
||
|
|
|