From cf99beb8fedbdd43ccca9ddaff2e2dee407e5ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 8 Feb 2022 10:54:26 +0100 Subject: [PATCH] Improve naming consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- programs/cipher/cipher_aead_demo.c | 8 ++++---- programs/psa/aead_demo.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/cipher/cipher_aead_demo.c b/programs/cipher/cipher_aead_demo.c index 4da1bfc5b4..c9a41ae5a7 100644 --- a/programs/cipher/cipher_aead_demo.c +++ b/programs/cipher/cipher_aead_demo.c @@ -181,8 +181,8 @@ static void aead_info( const mbedtls_cipher_context_t *ctx, size_t tag_len ) static int aead_encrypt( mbedtls_cipher_context_t *ctx, size_t tag_len, const unsigned char *iv, size_t iv_len, const unsigned char *ad, size_t ad_len, - const unsigned char *pa, size_t pa_len, - const unsigned char *pb, size_t pb_len ) + const unsigned char *part1, size_t part1_len, + const unsigned char *part2, size_t part2_len ) { int ret; size_t olen; @@ -192,9 +192,9 @@ static int aead_encrypt( mbedtls_cipher_context_t *ctx, size_t tag_len, CHK( mbedtls_cipher_set_iv( ctx, iv, iv_len ) ); CHK( mbedtls_cipher_reset( ctx ) ); CHK( mbedtls_cipher_update_ad( ctx, ad, ad_len ) ); - CHK( mbedtls_cipher_update( ctx, pa, pa_len, p, &olen ) ); + CHK( mbedtls_cipher_update( ctx, part1, part1_len, p, &olen ) ); p += olen; - CHK( mbedtls_cipher_update( ctx, pb, pb_len, p, &olen ) ); + CHK( mbedtls_cipher_update( ctx, part2, part2_len, p, &olen ) ); p += olen; CHK( mbedtls_cipher_finish( ctx, p, &olen ) ); p += olen; diff --git a/programs/psa/aead_demo.c b/programs/psa/aead_demo.c index 396e82883a..322908bedb 100644 --- a/programs/psa/aead_demo.c +++ b/programs/psa/aead_demo.c @@ -197,8 +197,8 @@ static void aead_info( psa_key_id_t key, psa_algorithm_t alg ) static int aead_encrypt( psa_key_id_t key, psa_algorithm_t alg, const unsigned char *iv, size_t iv_len, const unsigned char *ad, size_t ad_len, - const unsigned char *pa, size_t pa_len, - const unsigned char *pb, size_t pb_len ) + const unsigned char *part1, size_t part1_len, + const unsigned char *part2, size_t part2_len ) { psa_status_t status; size_t olen, olen_tag; @@ -211,9 +211,9 @@ static int aead_encrypt( psa_key_id_t key, psa_algorithm_t alg, PSA_CHECK( psa_aead_set_nonce( &op, iv, iv_len ) ); PSA_CHECK( psa_aead_update_ad( &op, ad, ad_len ) ); - PSA_CHECK( psa_aead_update( &op, pa, pa_len, p, end - p, &olen ) ); + PSA_CHECK( psa_aead_update( &op, part1, part1_len, p, end - p, &olen ) ); p += olen; - PSA_CHECK( psa_aead_update( &op, pb, pb_len, p, end - p, &olen ) ); + PSA_CHECK( psa_aead_update( &op, part2, part2_len, p, end - p, &olen ) ); p += olen; PSA_CHECK( psa_aead_finish( &op, p, end - p, &olen, tag, sizeof( tag ), &olen_tag ) );