coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10805 from bjwtaylor/unsafe-macros-3.6

Browse Source 
Backport 3.6: Unsafe macros
This commit is contained in:
Valerio Setti 2026-07-27 15:49:59 +00:00 committed by GitHub
commit f4a1aceb8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/psa/crypto_extra.h
View File

@ -1090,10 +1090,10 @@ typedef uint32_t psa_pake_primitive_t;
* Return 0 if the requested primitive can't be encoded as * Return 0 if the requested primitive can't be encoded as
* ::psa_pake_primitive_t. * ::psa_pake_primitive_t.
*/ */
#define PSA_PAKE_PRIMITIVE(pake_type, pake_family, pake_bits) \ #define PSA_PAKE_PRIMITIVE(pake_type, pake_family, pake_bits) \
((pake_bits & 0xFFFF) != pake_bits) ? 0 : \ ((((pake_bits) & 0xFFFF) != (pake_bits)) ? 0 : \
((psa_pake_primitive_t) (((pake_type) << 24 | \ ((psa_pake_primitive_t) ((((pake_type) << 24) | \
(pake_family) << 16) | (pake_bits))) ((pake_family) << 16)) | (pake_bits))))
/** The key share being sent to or received from the peer. /** The key share being sent to or received from the peer.
* *
@ -1170,12 +1170,12 @@ typedef uint32_t psa_pake_primitive_t;
* return 0. * return 0.
*/ */
#define PSA_PAKE_OUTPUT_SIZE(alg, primitive, output_step) \ #define PSA_PAKE_OUTPUT_SIZE(alg, primitive, output_step) \
(alg == PSA_ALG_JPAKE && \ ((alg) == PSA_ALG_JPAKE && \
primitive == PSA_PAKE_PRIMITIVE(PSA_PAKE_PRIMITIVE_TYPE_ECC, \ (primitive) == PSA_PAKE_PRIMITIVE(PSA_PAKE_PRIMITIVE_TYPE_ECC, \
PSA_ECC_FAMILY_SECP_R1, 256) ? \ PSA_ECC_FAMILY_SECP_R1, 256) ? \
( \ ( \
output_step == PSA_PAKE_STEP_KEY_SHARE ? 65 : \ (output_step) == PSA_PAKE_STEP_KEY_SHARE ? 65 : \
output_step == PSA_PAKE_STEP_ZK_PUBLIC ? 65 : \ (output_step) == PSA_PAKE_STEP_ZK_PUBLIC ? 65 : \
32 \ 32 \
) : \ ) : \
0) 0)
@ -1200,12 +1200,12 @@ typedef uint32_t psa_pake_primitive_t;
* the parameters are incompatible, return 0. * the parameters are incompatible, return 0.
*/ */
#define PSA_PAKE_INPUT_SIZE(alg, primitive, input_step) \ #define PSA_PAKE_INPUT_SIZE(alg, primitive, input_step) \
(alg == PSA_ALG_JPAKE && \ ((alg) == PSA_ALG_JPAKE && \
primitive == PSA_PAKE_PRIMITIVE(PSA_PAKE_PRIMITIVE_TYPE_ECC, \ (primitive) == PSA_PAKE_PRIMITIVE(PSA_PAKE_PRIMITIVE_TYPE_ECC, \
PSA_ECC_FAMILY_SECP_R1, 256) ? \ PSA_ECC_FAMILY_SECP_R1, 256) ? \
( \ ( \
input_step == PSA_PAKE_STEP_KEY_SHARE ? 65 : \ (input_step) == PSA_PAKE_STEP_KEY_SHARE ? 65 : \
input_step == PSA_PAKE_STEP_ZK_PUBLIC ? 65 : \ (input_step) == PSA_PAKE_STEP_ZK_PUBLIC ? 65 : \
32 \ 32 \
) : \ ) : \
0) 0)

2
include/psa/crypto_values.h
View File

@ -590,7 +590,7 @@
0)) 0))
/** Check if the curve of given family is Weierstrass elliptic curve. */ /** Check if the curve of given family is Weierstrass elliptic curve. */
#define PSA_ECC_FAMILY_IS_WEIERSTRASS(family) ((family & 0xc0) == 0) #define PSA_ECC_FAMILY_IS_WEIERSTRASS(family) (((family) & 0xc0) == 0)
/** SEC Koblitz curves over prime fields. /** SEC Koblitz curves over prime fields.
* *

4
library/ecp_curves.c
View File

@ -5012,14 +5012,14 @@ int mbedtls_ecp_mod_p192_raw(mbedtls_mpi_uint *Np, size_t Nn)
#if defined(MBEDTLS_HAVE_INT32) /* 32 bit */ #if defined(MBEDTLS_HAVE_INT32) /* 32 bit */
#define MAX32 X_limbs #define MAX32 (X_limbs)
#define A(j) X[j] #define A(j) X[j]
#define STORE32 X[i] = (mbedtls_mpi_uint) cur; #define STORE32 X[i] = (mbedtls_mpi_uint) cur;
#define STORE0 X[i] = 0; #define STORE0 X[i] = 0;
#else /* 64 bit */ #else /* 64 bit */
#define MAX32 X_limbs * 2 #define MAX32 (X_limbs * 2)
#define A(j) \ #define A(j) \
(j) % 2 ? \ (j) % 2 ? \
(uint32_t) (X[(j) / 2] >> 32) : \ (uint32_t) (X[(j) / 2] >> 32) : \

2
library/pk_internal.h
View File

@ -153,7 +153,7 @@ static inline mbedtls_ecp_group_id mbedtls_pk_get_ec_group_id(const mbedtls_pk_c
#endif /* MBEDTLS_ECP_HAVE_CURVE25519 || MBEDTLS_ECP_DP_CURVE448 */ #endif /* MBEDTLS_ECP_HAVE_CURVE25519 || MBEDTLS_ECP_DP_CURVE448 */
#define MBEDTLS_PK_IS_RFC8410_GROUP_ID(id) \ #define MBEDTLS_PK_IS_RFC8410_GROUP_ID(id) \
((id == MBEDTLS_ECP_DP_CURVE25519) || (id == MBEDTLS_ECP_DP_CURVE448)) (((id) == MBEDTLS_ECP_DP_CURVE25519) || ((id) == MBEDTLS_ECP_DP_CURVE448))
static inline int mbedtls_pk_is_rfc8410(const mbedtls_pk_context *pk) static inline int mbedtls_pk_is_rfc8410(const mbedtls_pk_context *pk)
{ {

2
library/sha3.c
View File

@ -72,7 +72,7 @@
* YMMV. * YMMV.
*/ */
/* Helper macro to set the values of the higher bits in unused low positions */ /* Helper macro to set the values of the higher bits in unused low positions */
#define H(b63, b31, b15) (b63 << 6 | b31 << 5 | b15 << 4) #define H(b63, b31, b15) (((b63) << 6) | ((b31) << 5) | ((b15) << 4))
static const uint8_t iota_r_packed[24] = { static const uint8_t iota_r_packed[24] = {
H(0, 0, 0) | 0x01, H(0, 0, 1) | 0x82, H(1, 0, 1) | 0x8a, H(1, 1, 1) | 0x00, H(0, 0, 0) | 0x01, H(0, 0, 1) | 0x82, H(1, 0, 1) | 0x8a, H(1, 1, 1) | 0x00,
H(0, 0, 1) | 0x8b, H(0, 1, 0) | 0x01, H(1, 1, 1) | 0x81, H(1, 0, 1) | 0x09, H(0, 0, 1) | 0x8b, H(0, 1, 0) | 0x01, H(1, 1, 1) | 0x81, H(1, 0, 1) | 0x09,

7
tests/suites/test_suite_psa_crypto.function
View File

@ -11173,6 +11173,7 @@ void ecjpake_size_macros()
{ {
const psa_algorithm_t alg = PSA_ALG_JPAKE; const psa_algorithm_t alg = PSA_ALG_JPAKE;
const size_t bits = 256; const size_t bits = 256;
const psa_pake_primitive_t invalid_primitive = 1;
const psa_pake_primitive_t prim = PSA_PAKE_PRIMITIVE( const psa_pake_primitive_t prim = PSA_PAKE_PRIMITIVE(
PSA_PAKE_PRIMITIVE_TYPE_ECC, PSA_ECC_FAMILY_SECP_R1, bits); PSA_PAKE_PRIMITIVE_TYPE_ECC, PSA_ECC_FAMILY_SECP_R1, bits);
const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR( const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR(
@ -11209,5 +11210,11 @@ void ecjpake_size_macros()
PSA_PAKE_INPUT_MAX_SIZE); PSA_PAKE_INPUT_MAX_SIZE);
TEST_LE_U(PSA_PAKE_INPUT_SIZE(alg, prim, PSA_PAKE_STEP_ZK_PROOF), TEST_LE_U(PSA_PAKE_INPUT_SIZE(alg, prim, PSA_PAKE_STEP_ZK_PROOF),
PSA_PAKE_INPUT_MAX_SIZE); PSA_PAKE_INPUT_MAX_SIZE);
/* Invalid primitives must not match the supported J-PAKE suite. */
TEST_EQUAL(PSA_PAKE_OUTPUT_SIZE(alg, invalid_primitive,
PSA_PAKE_STEP_KEY_SHARE), 0);
TEST_EQUAL(PSA_PAKE_INPUT_SIZE(alg, invalid_primitive,
PSA_PAKE_STEP_KEY_SHARE), 0);
} }
/* END_CASE */ /* END_CASE */

7
tests/suites/test_suite_psa_crypto_pake.function
View File

@ -937,6 +937,7 @@ void ecjpake_size_macros()
{ {
const psa_algorithm_t alg = PSA_ALG_JPAKE; const psa_algorithm_t alg = PSA_ALG_JPAKE;
const size_t bits = 256; const size_t bits = 256;
const psa_pake_primitive_t invalid_primitive = 1;
const psa_pake_primitive_t prim = PSA_PAKE_PRIMITIVE( const psa_pake_primitive_t prim = PSA_PAKE_PRIMITIVE(
PSA_PAKE_PRIMITIVE_TYPE_ECC, PSA_ECC_FAMILY_SECP_R1, bits); PSA_PAKE_PRIMITIVE_TYPE_ECC, PSA_ECC_FAMILY_SECP_R1, bits);
const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR( const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR(
@ -973,6 +974,12 @@ void ecjpake_size_macros()
PSA_PAKE_INPUT_MAX_SIZE); PSA_PAKE_INPUT_MAX_SIZE);
TEST_LE_U(PSA_PAKE_INPUT_SIZE(alg, prim, PSA_PAKE_STEP_ZK_PROOF), TEST_LE_U(PSA_PAKE_INPUT_SIZE(alg, prim, PSA_PAKE_STEP_ZK_PROOF),
PSA_PAKE_INPUT_MAX_SIZE); PSA_PAKE_INPUT_MAX_SIZE);
/* Invalid primitives must not match the supported J-PAKE suite. */
TEST_EQUAL(PSA_PAKE_OUTPUT_SIZE(alg, invalid_primitive,
PSA_PAKE_STEP_KEY_SHARE), 0);
TEST_EQUAL(PSA_PAKE_INPUT_SIZE(alg, invalid_primitive,
PSA_PAKE_STEP_KEY_SHARE), 0);
} }
/* END_CASE */ /* END_CASE */