commit a557cb8c8bfeb6a327e6e15b5e812a4ab42b4333
author Neil Armstrong <narmstrong@baylibre.com> Fri Jun 10 08:58:32 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Wed Aug 31 10:49:18 2022 +0200
tree fbdbcc863c0814b1590d1e212cf5ce2f36f74cac
parent fbc4b4aa8e86fc3f2c584a1ad5157ccb90bb5d9f

Fixing XXX_ALG_ECJPAKE to XXX_ALG_JPAKE to match specification

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

library/psa_crypto_pake.c

diff --git a/library/psa_crypto_pake.c b/library/psa_crypto_pake.c
index 48995dd..1aa8a72 100644
--- a/library/psa_crypto_pake.c
+++ b/library/psa_crypto_pake.c
@@ -33,7 +33,7 @@
 #include <mbedtls/error.h>
 #include <string.h>
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
 #define PSA_PAKE_BUFFER_SIZE ( ( 69 + 66 + 33 ) * 2 )
 #endif
 
@@ -130,7 +130,7 @@
         return( PSA_ERROR_INVALID_ARGUMENT );
     }
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( cipher_suite->algorithm == PSA_ALG_JPAKE )
     {
         if( cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_ECC ||
@@ -248,7 +248,7 @@
         return PSA_ERROR_INVALID_ARGUMENT;
     }
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
         if( role != PSA_PAKE_ROLE_CLIENT &&
@@ -264,7 +264,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
 static psa_status_t psa_pake_ecjpake_setup( psa_pake_operation_t *operation )
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@@ -331,7 +331,7 @@
     if( output == NULL || output_size == 0 || output_length == NULL )
         return( PSA_ERROR_INVALID_ARGUMENT );
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
         if( operation->state == PSA_PAKE_STATE_SETUP ) {
@@ -514,7 +514,7 @@
     if( input == NULL || input_length == 0 )
         return( PSA_ERROR_INVALID_ARGUMENT );
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
         if( operation->state == PSA_PAKE_STATE_SETUP ) {
@@ -664,7 +664,7 @@
           operation->output_step != PSA_PAKE_STEP_DERIVE ) )
         return( PSA_ERROR_BAD_STATE );
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
         ret = mbedtls_ecjpake_derive_secret( &operation->ctx.ecjpake,
@@ -702,7 +702,7 @@
         return( PSA_SUCCESS );
     }
 
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECJPAKE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
     if( operation->alg == PSA_ALG_JPAKE )
     {
         operation->input_step = 0;