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

psa_util: remove CRYPTO_C guard from ECDSA conversion functions

Browse source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-01-10 08:46:59 +01:00
parent 99c0369d31
commit c22e3ce8ef
3 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/mbedtls/psa_util.h
View file

@ -16,10 +16,10 @@
#include "psa/crypto.h" #include "psa/crypto.h"
/* ASN1 defines used in the ECDSA conversion functions. */ /* ASN1 defines used in the ECDSA conversion functions.
#if defined(MBEDTLS_ASN1_WRITE_C) || defined(MBEDTLS_ASN1_PARSE_C) * Note: intentionally not adding MBEDTLS_ASN1_[PARSE|WRITE]_C guards here
* otherwise error codes would be unknown in test_suite_psa_crypto_util.data.*/
#include <mbedtls/asn1write.h> #include <mbedtls/asn1write.h>
#endif
#if defined(MBEDTLS_PSA_CRYPTO_C) #if defined(MBEDTLS_PSA_CRYPTO_C)
@ -180,6 +180,7 @@ static inline mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa
{ {
return (mbedtls_md_type_t) (psa_alg & PSA_ALG_HASH_MASK); return (mbedtls_md_type_t) (psa_alg & PSA_ALG_HASH_MASK);
} }
#endif /* MBEDTLS_PSA_CRYPTO_C */
#if defined(MBEDTLS_ASN1_WRITE_C) #if defined(MBEDTLS_ASN1_WRITE_C)
/** Convert an ECDSA signature from raw format (used by PSA APIs) to DER ASN.1 /** Convert an ECDSA signature from raw format (used by PSA APIs) to DER ASN.1
@ -221,5 +222,4 @@ int mbedtls_ecdsa_der_to_raw(const unsigned char *der, size_t der_len,
/**@}*/ /**@}*/
#endif /* MBEDTLS_PSA_CRYPTO_C */
#endif /* MBEDTLS_PSA_UTIL_H */ #endif /* MBEDTLS_PSA_UTIL_H */

22
library/psa_util.c
View file

@ -8,14 +8,20 @@
#include "common.h" #include "common.h"
/* This is needed for MBEDTLS_ERR_XXX macros */
#include <mbedtls/error.h>
#if defined(MBEDTLS_ASN1_WRITE_C)
#include <mbedtls/asn1write.h>
#include <psa/crypto_sizes.h>
#endif
#include "psa_util_internal.h"
#if defined(MBEDTLS_PSA_CRYPTO_C) #if defined(MBEDTLS_PSA_CRYPTO_C)
#include <psa/crypto.h> #include <psa/crypto.h>
#include "psa_util_internal.h"
/* The following includes are needed for MBEDTLS_ERR_XXX macros */
#include <mbedtls/error.h>
#if defined(MBEDTLS_MD_LIGHT) #if defined(MBEDTLS_MD_LIGHT)
#include <mbedtls/md.h> #include <mbedtls/md.h>
#endif #endif
@ -40,10 +46,6 @@
#if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
#include <mbedtls/cipher.h> #include <mbedtls/cipher.h>
#endif #endif
#if defined(MBEDTLS_ASN1_WRITE_C)
#include <mbedtls/asn1write.h>
#include <psa/crypto_sizes.h>
#endif
/* PSA_SUCCESS is kept at the top of each error table since /* PSA_SUCCESS is kept at the top of each error table since
* it's the most common status when everything functions properly. */ * it's the most common status when everything functions properly. */
@ -334,6 +336,8 @@ mbedtls_ecp_group_id mbedtls_ecc_group_from_psa(psa_ecc_family_t family,
} }
#endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */ #endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */
#endif /* MBEDTLS_PSA_CRYPTO_C */
#if defined(MBEDTLS_ASN1_WRITE_C) #if defined(MBEDTLS_ASN1_WRITE_C)
/** /**
* \brief Convert a single raw coordinate to DER ASN.1 format. The output der * \brief Convert a single raw coordinate to DER ASN.1 format. The output der
@ -565,5 +569,3 @@ int mbedtls_ecdsa_der_to_raw(const unsigned char *der, size_t der_len,
return 0; return 0;
} }
#endif /* MBEDTLS_ASN1_PARSE_C */ #endif /* MBEDTLS_ASN1_PARSE_C */
#endif /* MBEDTLS_PSA_CRYPTO_C */

7
tests/suites/test_suite_psa_crypto_util.function
View file

@ -8,12 +8,7 @@ enum {
}; };
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_CASE depends_on:MBEDTLS_ASN1_WRITE_C:MBEDTLS_ASN1_PARSE_C */
* depends_on:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_ASN1_WRITE_C:MBEDTLS_ASN1_PARSE_C
* END_DEPENDENCIES
*/
/* BEGIN_CASE */
void ecdsa_raw_to_der(int direction, int key_bits, data_t *input, data_t *exp_result, int exp_ret) void ecdsa_raw_to_der(int direction, int key_bits, data_t *input, data_t *exp_result, int exp_ret)
{ {
unsigned char *tmp_buf = NULL; unsigned char *tmp_buf = NULL;