espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-05-10 03:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

cipher_wrap: remove *setkey_dec_func in CIPHER_ENCRYPT_ONLY

Browse Source 
There is no need to set decrypt key under CIPHER_ENCRYPT_ONLY,
so we can remove *setkey_dec_func from ctx to save extra code size.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-08-24 15:47:53 +08:00
parent 9141ad1223
commit db9b3095fb
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/cipher.c
View File

@ -396,6 +396,7 @@ int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx,
ctx->key_bitlen = key_bitlen; ctx->key_bitlen = key_bitlen;
ctx->operation = operation; ctx->operation = operation;
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
/* /*
* For OFB, CFB and CTR mode always use the encryption key schedule * For OFB, CFB and CTR mode always use the encryption key schedule
*/ */
@ -413,6 +414,10 @@ int mbedtls_cipher_setkey(mbedtls_cipher_context_t *ctx,
} }
return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA; return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
#else
return mbedtls_cipher_get_base(ctx->cipher_info)->setkey_enc_func(ctx->cipher_ctx, key,
ctx->key_bitlen);
#endif
} }
int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx, int mbedtls_cipher_set_iv(mbedtls_cipher_context_t *ctx,

42
library/cipher_wrap.c
View File

@ -238,11 +238,13 @@ static int aes_crypt_xts_wrap(void *ctx, mbedtls_operation_t operation,
} }
#endif /* MBEDTLS_CIPHER_MODE_XTS */ #endif /* MBEDTLS_CIPHER_MODE_XTS */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int aes_setkey_dec_wrap(void *ctx, const unsigned char *key, static int aes_setkey_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
return mbedtls_aes_setkey_dec((mbedtls_aes_context *) ctx, key, key_bitlen); return mbedtls_aes_setkey_dec((mbedtls_aes_context *) ctx, key, key_bitlen);
} }
#endif
static int aes_setkey_enc_wrap(void *ctx, const unsigned char *key, static int aes_setkey_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -291,7 +293,9 @@ static const mbedtls_cipher_base_t aes_info = {
NULL, NULL,
#endif #endif
aes_setkey_enc_wrap, aes_setkey_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
aes_setkey_dec_wrap, aes_setkey_dec_wrap,
#endif
aes_ctx_alloc, aes_ctx_alloc,
aes_ctx_free aes_ctx_free
}; };
@ -587,7 +591,9 @@ static const mbedtls_cipher_base_t gcm_aes_info = {
NULL, NULL,
#endif #endif
gcm_aes_setkey_wrap, gcm_aes_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
gcm_aes_setkey_wrap, gcm_aes_setkey_wrap,
#endif
gcm_ctx_alloc, gcm_ctx_alloc,
gcm_ctx_free, gcm_ctx_free,
}; };
@ -656,7 +662,9 @@ static const mbedtls_cipher_base_t ccm_aes_info = {
NULL, NULL,
#endif #endif
ccm_aes_setkey_wrap, ccm_aes_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
ccm_aes_setkey_wrap, ccm_aes_setkey_wrap,
#endif
ccm_ctx_alloc, ccm_ctx_alloc,
ccm_ctx_free, ccm_ctx_free,
}; };
@ -769,11 +777,13 @@ static int camellia_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
} }
#endif /* MBEDTLS_CIPHER_MODE_CTR */ #endif /* MBEDTLS_CIPHER_MODE_CTR */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int camellia_setkey_dec_wrap(void *ctx, const unsigned char *key, static int camellia_setkey_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
return mbedtls_camellia_setkey_dec((mbedtls_camellia_context *) ctx, key, key_bitlen); return mbedtls_camellia_setkey_dec((mbedtls_camellia_context *) ctx, key, key_bitlen);
} }
#endif
static int camellia_setkey_enc_wrap(void *ctx, const unsigned char *key, static int camellia_setkey_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -823,7 +833,9 @@ static const mbedtls_cipher_base_t camellia_info = {
NULL, NULL,
#endif #endif
camellia_setkey_enc_wrap, camellia_setkey_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
camellia_setkey_dec_wrap, camellia_setkey_dec_wrap,
#endif
camellia_ctx_alloc, camellia_ctx_alloc,
camellia_ctx_free camellia_ctx_free
}; };
@ -996,7 +1008,9 @@ static const mbedtls_cipher_base_t gcm_camellia_info = {
NULL, NULL,
#endif #endif
gcm_camellia_setkey_wrap, gcm_camellia_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
gcm_camellia_setkey_wrap, gcm_camellia_setkey_wrap,
#endif
gcm_ctx_alloc, gcm_ctx_alloc,
gcm_ctx_free, gcm_ctx_free,
}; };
@ -1065,7 +1079,9 @@ static const mbedtls_cipher_base_t ccm_camellia_info = {
NULL, NULL,
#endif #endif
ccm_camellia_setkey_wrap, ccm_camellia_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
ccm_camellia_setkey_wrap, ccm_camellia_setkey_wrap,
#endif
ccm_ctx_alloc, ccm_ctx_alloc,
ccm_ctx_free, ccm_ctx_free,
}; };
@ -1179,11 +1195,13 @@ static int aria_crypt_ctr_wrap(void *ctx, size_t length, size_t *nc_off,
} }
#endif /* MBEDTLS_CIPHER_MODE_CTR */ #endif /* MBEDTLS_CIPHER_MODE_CTR */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int aria_setkey_dec_wrap(void *ctx, const unsigned char *key, static int aria_setkey_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
return mbedtls_aria_setkey_dec((mbedtls_aria_context *) ctx, key, key_bitlen); return mbedtls_aria_setkey_dec((mbedtls_aria_context *) ctx, key, key_bitlen);
} }
#endif
static int aria_setkey_enc_wrap(void *ctx, const unsigned char *key, static int aria_setkey_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -1233,7 +1251,9 @@ static const mbedtls_cipher_base_t aria_info = {
NULL, NULL,
#endif #endif
aria_setkey_enc_wrap, aria_setkey_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
aria_setkey_dec_wrap, aria_setkey_dec_wrap,
#endif
aria_ctx_alloc, aria_ctx_alloc,
aria_ctx_free aria_ctx_free
}; };
@ -1406,7 +1426,9 @@ static const mbedtls_cipher_base_t gcm_aria_info = {
NULL, NULL,
#endif #endif
gcm_aria_setkey_wrap, gcm_aria_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
gcm_aria_setkey_wrap, gcm_aria_setkey_wrap,
#endif
gcm_ctx_alloc, gcm_ctx_alloc,
gcm_ctx_free, gcm_ctx_free,
}; };
@ -1475,7 +1497,9 @@ static const mbedtls_cipher_base_t ccm_aria_info = {
NULL, NULL,
#endif #endif
ccm_aria_setkey_wrap, ccm_aria_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
ccm_aria_setkey_wrap, ccm_aria_setkey_wrap,
#endif
ccm_ctx_alloc, ccm_ctx_alloc,
ccm_ctx_free, ccm_ctx_free,
}; };
@ -1583,6 +1607,7 @@ static int des3_crypt_cbc_wrap(void *ctx, mbedtls_operation_t operation, size_t
} }
#endif /* MBEDTLS_CIPHER_MODE_CBC */ #endif /* MBEDTLS_CIPHER_MODE_CBC */
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int des_setkey_dec_wrap(void *ctx, const unsigned char *key, static int des_setkey_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
@ -1590,6 +1615,7 @@ static int des_setkey_dec_wrap(void *ctx, const unsigned char *key,
return mbedtls_des_setkey_dec((mbedtls_des_context *) ctx, key); return mbedtls_des_setkey_dec((mbedtls_des_context *) ctx, key);
} }
#endif
static int des_setkey_enc_wrap(void *ctx, const unsigned char *key, static int des_setkey_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -1599,6 +1625,7 @@ static int des_setkey_enc_wrap(void *ctx, const unsigned char *key,
return mbedtls_des_setkey_enc((mbedtls_des_context *) ctx, key); return mbedtls_des_setkey_enc((mbedtls_des_context *) ctx, key);
} }
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int des3_set2key_dec_wrap(void *ctx, const unsigned char *key, static int des3_set2key_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
@ -1606,6 +1633,7 @@ static int des3_set2key_dec_wrap(void *ctx, const unsigned char *key,
return mbedtls_des3_set2key_dec((mbedtls_des3_context *) ctx, key); return mbedtls_des3_set2key_dec((mbedtls_des3_context *) ctx, key);
} }
#endif
static int des3_set2key_enc_wrap(void *ctx, const unsigned char *key, static int des3_set2key_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -1615,6 +1643,7 @@ static int des3_set2key_enc_wrap(void *ctx, const unsigned char *key,
return mbedtls_des3_set2key_enc((mbedtls_des3_context *) ctx, key); return mbedtls_des3_set2key_enc((mbedtls_des3_context *) ctx, key);
} }
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
static int des3_set3key_dec_wrap(void *ctx, const unsigned char *key, static int des3_set3key_dec_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
{ {
@ -1622,6 +1651,7 @@ static int des3_set3key_dec_wrap(void *ctx, const unsigned char *key,
return mbedtls_des3_set3key_dec((mbedtls_des3_context *) ctx, key); return mbedtls_des3_set3key_dec((mbedtls_des3_context *) ctx, key);
} }
#endif
static int des3_set3key_enc_wrap(void *ctx, const unsigned char *key, static int des3_set3key_enc_wrap(void *ctx, const unsigned char *key,
unsigned int key_bitlen) unsigned int key_bitlen)
@ -1692,7 +1722,9 @@ static const mbedtls_cipher_base_t des_info = {
NULL, NULL,
#endif #endif
des_setkey_enc_wrap, des_setkey_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
des_setkey_dec_wrap, des_setkey_dec_wrap,
#endif
des_ctx_alloc, des_ctx_alloc,
des_ctx_free des_ctx_free
}; };
@ -1743,7 +1775,9 @@ static const mbedtls_cipher_base_t des_ede_info = {
NULL, NULL,
#endif #endif
des3_set2key_enc_wrap, des3_set2key_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
des3_set2key_dec_wrap, des3_set2key_dec_wrap,
#endif
des3_ctx_alloc, des3_ctx_alloc,
des3_ctx_free des3_ctx_free
}; };
@ -1794,7 +1828,9 @@ static const mbedtls_cipher_base_t des_ede3_info = {
NULL, NULL,
#endif #endif
des3_set3key_enc_wrap, des3_set3key_enc_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
des3_set3key_dec_wrap, des3_set3key_dec_wrap,
#endif
des3_ctx_alloc, des3_ctx_alloc,
des3_ctx_free des3_ctx_free
}; };
@ -1895,7 +1931,9 @@ static const mbedtls_cipher_base_t chacha20_base_info = {
chacha20_stream_wrap, chacha20_stream_wrap,
#endif #endif
chacha20_setkey_wrap, chacha20_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
chacha20_setkey_wrap, chacha20_setkey_wrap,
#endif
chacha20_ctx_alloc, chacha20_ctx_alloc,
chacha20_ctx_free chacha20_ctx_free
}; };
@ -1970,7 +2008,9 @@ static const mbedtls_cipher_base_t chachapoly_base_info = {
NULL, NULL,
#endif #endif
chachapoly_setkey_wrap, chachapoly_setkey_wrap,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
chachapoly_setkey_wrap, chachapoly_setkey_wrap,
#endif
chachapoly_ctx_alloc, chachapoly_ctx_alloc,
chachapoly_ctx_free chachapoly_ctx_free
}; };
@ -2038,7 +2078,9 @@ static const mbedtls_cipher_base_t null_base_info = {
null_crypt_stream, null_crypt_stream,
#endif #endif
null_setkey, null_setkey,
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
null_setkey, null_setkey,
#endif
null_ctx_alloc, null_ctx_alloc,
null_ctx_free null_ctx_free
}; };

2
library/cipher_wrap.h
View File

@ -93,9 +93,11 @@ struct mbedtls_cipher_base_t {
int (*setkey_enc_func)(void *ctx, const unsigned char *key, int (*setkey_enc_func)(void *ctx, const unsigned char *key,
unsigned int key_bitlen); unsigned int key_bitlen);
#if !defined(MBEDTLS_CIPHER_ENCRYPT_ONLY)
/** Set key for decryption purposes */ /** Set key for decryption purposes */
int (*setkey_dec_func)(void *ctx, const unsigned char *key, int (*setkey_dec_func)(void *ctx, const unsigned char *key,
unsigned int key_bitlen); unsigned int key_bitlen);
#endif
/** Allocate a new context */ /** Allocate a new context */
void * (*ctx_alloc_func)(void); void * (*ctx_alloc_func)(void);