lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Replace __attribute__((nonstring)) with macro MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING

Browse Source 
This macro applies __attribute__((nonstring)) when using a compiler that supports it

Signed-off-by: Felix Conway <felix.conway@arm.com>
This commit is contained in:
Felix Conway
2025-06-12 11:28:56 +01:00
committed by Ari Weiler-Ofek
parent 79b513894a
commit 5b84ae14e9
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_tls13_keys.c
View File

@ -81,7 +81,7 @@ struct mbedtls_ssl_tls13_labels_struct const mbedtls_ssl_tls13_labels =
*/ */
/* We need to tell the compiler that we meant to leave out the null character. */ /* We need to tell the compiler that we meant to leave out the null character. */
static const char tls13_label_prefix[6] __attribute__ ((nonstring)) = "tls13 "; static const char tls13_label_prefix[6] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING = "tls13 ";
#define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \ #define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \
(2 /* expansion length */ \ (2 /* expansion length */ \

2
library/ssl_tls13_keys.h
View File

@ -42,7 +42,7 @@
/* We need to tell the compiler that we meant to leave out the null character. */ /* We need to tell the compiler that we meant to leave out the null character. */
#define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \ #define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \
const unsigned char name [sizeof(string) - 1] __attribute__ ((nonstring)); const unsigned char name [sizeof(string) - 1] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING;
union mbedtls_ssl_tls13_labels_union { union mbedtls_ssl_tls13_labels_union {
MBEDTLS_SSL_TLS1_3_LABEL_LIST MBEDTLS_SSL_TLS1_3_LABEL_LIST

3
tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
View File

@ -26,7 +26,8 @@ int psa_aead_encrypt_decrypt_main(void)
uint8_t decrypt[BUFFER_SIZE] = { 0 }; uint8_t decrypt[BUFFER_SIZE] = { 0 };
const uint8_t plaintext[] = "Hello World!"; const uint8_t plaintext[] = "Hello World!";
/* We need to tell the compiler that we meant to leave out the null character. */ /* We need to tell the compiler that we meant to leave out the null character. */
const uint8_t key_bytes[32] __attribute__ ((nonstring)) = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; const uint8_t key_bytes[32] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING =
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
uint8_t nonce[PSA_AEAD_NONCE_LENGTH(PSA_KEY_TYPE_AES, PSA_ALG_CCM)]; uint8_t nonce[PSA_AEAD_NONCE_LENGTH(PSA_KEY_TYPE_AES, PSA_ALG_CCM)];
size_t nonce_length = sizeof(nonce); size_t nonce_length = sizeof(nonce);
size_t ciphertext_length; size_t ciphertext_length;

3
tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
View File

@ -26,7 +26,8 @@ int psa_cipher_encrypt_decrypt_main(void)
uint8_t encrypt[BUFFER_SIZE] = { 0 }; uint8_t encrypt[BUFFER_SIZE] = { 0 };
uint8_t decrypt[BUFFER_SIZE] = { 0 }; uint8_t decrypt[BUFFER_SIZE] = { 0 };
/* We need to tell the compiler that we meant to leave out the null character. */ /* We need to tell the compiler that we meant to leave out the null character. */
const uint8_t key_bytes[32] __attribute__ ((nonstring)) = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; const uint8_t key_bytes[32] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING =
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
size_t encrypted_length; size_t encrypted_length;
size_t decrypted_length; size_t decrypted_length;

2
tests/suites/test_suite_ssl_decrypt.function
View File

@ -38,7 +38,7 @@ void ssl_decrypt_null(int hash_id)
MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_TRANSPORT_STREAM,
version); version);
/* We need to tell the compiler that we meant to leave out the null character. */ /* We need to tell the compiler that we meant to leave out the null character. */
const char sample_plaintext[3] __attribute__ ((nonstring)) = "ABC"; const char sample_plaintext[3] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING = "ABC";
mbedtls_ssl_context ssl; mbedtls_ssl_context ssl;
mbedtls_ssl_init(&ssl); mbedtls_ssl_init(&ssl);
uint8_t *buf = NULL; uint8_t *buf = NULL;