eden-emu/mbedtls
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

des: don't consider DES for CIPHER_ENCRYPT_ONLY

Browse source 
We only support ECB and CBC modes for DES. Those two modes require
both encrypt and decrypt directions, so we don't consider DES with
CIPHER_ENCRYPT_ONLY.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-09-07 16:25:22 +08:00
parent 4f4822c553
commit 56e27b9938
2 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/mbedtls/des.h
View file

@ -182,7 +182,6 @@ int mbedtls_des_key_check_weak(const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
MBEDTLS_CHECK_RETURN_TYPICAL MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]); int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
/** /**
* \brief DES key schedule (56-bit, decryption) * \brief DES key schedule (56-bit, decryption)
* *
@ -197,7 +196,6 @@ int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBE
*/ */
MBEDTLS_CHECK_RETURN_TYPICAL MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]); int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]);
#endif /* !MBEDTLS_CIPHER_ENCRYPT_ONLY */
/** /**
* \brief Triple-DES key schedule (112-bit, encryption) * \brief Triple-DES key schedule (112-bit, encryption)
@ -215,7 +213,6 @@ MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx, int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]); const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]);
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
/** /**
* \brief Triple-DES key schedule (112-bit, decryption) * \brief Triple-DES key schedule (112-bit, decryption)
* *
@ -231,7 +228,6 @@ int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
MBEDTLS_CHECK_RETURN_TYPICAL MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx, int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]); const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]);
#endif /* !MBEDTLS_CIPHER_ENCRYPT_ONLY */
/** /**
* \brief Triple-DES key schedule (168-bit, encryption) * \brief Triple-DES key schedule (168-bit, encryption)
@ -249,7 +245,6 @@ MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx, int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]); const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]);
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
/** /**
* \brief Triple-DES key schedule (168-bit, decryption) * \brief Triple-DES key schedule (168-bit, decryption)
* *
@ -265,7 +260,6 @@ int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
MBEDTLS_CHECK_RETURN_TYPICAL MBEDTLS_CHECK_RETURN_TYPICAL
int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx, int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]); const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]);
#endif /* !MBEDTLS_CIPHER_ENCRYPT_ONLY */
/** /**
* \brief DES-ECB block encryption/decryption * \brief DES-ECB block encryption/decryption

21
library/des.c
View file

@ -483,7 +483,6 @@ int mbedtls_des_setkey_enc(mbedtls_des_context *ctx, const unsigned char key[MBE
/* /*
* DES key schedule (56-bit, decryption) * DES key schedule (56-bit, decryption)
*/ */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE]) int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBEDTLS_DES_KEY_SIZE])
{ {
int i; int i;
@ -497,7 +496,6 @@ int mbedtls_des_setkey_dec(mbedtls_des_context *ctx, const unsigned char key[MBE
return 0; return 0;
} }
#endif
static void des3_set2key(uint32_t esk[96], static void des3_set2key(uint32_t esk[96],
uint32_t dsk[96], uint32_t dsk[96],
@ -540,7 +538,6 @@ int mbedtls_des3_set2key_enc(mbedtls_des3_context *ctx,
/* /*
* Triple-DES key schedule (112-bit, decryption) * Triple-DES key schedule (112-bit, decryption)
*/ */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx, int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2]) const unsigned char key[MBEDTLS_DES_KEY_SIZE * 2])
{ {
@ -551,7 +548,6 @@ int mbedtls_des3_set2key_dec(mbedtls_des3_context *ctx,
return 0; return 0;
} }
#endif
static void des3_set3key(uint32_t esk[96], static void des3_set3key(uint32_t esk[96],
uint32_t dsk[96], uint32_t dsk[96],
@ -592,7 +588,6 @@ int mbedtls_des3_set3key_enc(mbedtls_des3_context *ctx,
/* /*
* Triple-DES key schedule (168-bit, decryption) * Triple-DES key schedule (168-bit, decryption)
*/ */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx, int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3]) const unsigned char key[MBEDTLS_DES_KEY_SIZE * 3])
{ {
@ -603,7 +598,6 @@ int mbedtls_des3_set3key_dec(mbedtls_des3_context *ctx,
return 0; return 0;
} }
#endif
/* /*
* DES-ECB block encryption/decryption * DES-ECB block encryption/decryption
@ -875,43 +869,28 @@ int mbedtls_des_self_test(int verbose)
(v == MBEDTLS_DES_DECRYPT) ? "dec" : "enc"); (v == MBEDTLS_DES_DECRYPT) ? "dec" : "enc");
} }
#if defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
if (v == MBEDTLS_DES_DECRYPT) {
if (verbose != 0) {
mbedtls_printf("skipped\n");
}
continue;
}
#endif
memcpy(buf, des3_test_buf, 8); memcpy(buf, des3_test_buf, 8);
switch (i) { switch (i) {
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
case 0: case 0:
ret = mbedtls_des_setkey_dec(&ctx, des3_test_keys); ret = mbedtls_des_setkey_dec(&ctx, des3_test_keys);
break; break;
#endif
case 1: case 1:
ret = mbedtls_des_setkey_enc(&ctx, des3_test_keys); ret = mbedtls_des_setkey_enc(&ctx, des3_test_keys);
break; break;
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
case 2: case 2:
ret = mbedtls_des3_set2key_dec(&ctx3, des3_test_keys); ret = mbedtls_des3_set2key_dec(&ctx3, des3_test_keys);
break; break;
#endif
case 3: case 3:
ret = mbedtls_des3_set2key_enc(&ctx3, des3_test_keys); ret = mbedtls_des3_set2key_enc(&ctx3, des3_test_keys);
break; break;
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
case 4: case 4:
ret = mbedtls_des3_set3key_dec(&ctx3, des3_test_keys); ret = mbedtls_des3_set3key_dec(&ctx3, des3_test_keys);
break; break;
#endif
case 5: case 5:
ret = mbedtls_des3_set3key_enc(&ctx3, des3_test_keys); ret = mbedtls_des3_set3key_enc(&ctx3, des3_test_keys);