commit dff21d3429449bcc89d3980a38bcbaa83545168f
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue Feb 14 20:09:10 2023 +0100
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Feb 22 11:30:32 2023 +0100
tree c3b3dfd6b8ff0fd80292d0a4fa8e54b48e41488e
parent 4fcc61eec055dc8451c348f850e207796c765eea

Move jpake role check to psa_pake_complete_inputs()

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 9c12863..0fd0eff 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -7483,6 +7483,12 @@
         return PSA_ERROR_BAD_STATE;
     }
 
+    if (operation->alg == PSA_ALG_JPAKE &&
+        inputs.role != PSA_PAKE_ROLE_CLIENT &&
+        inputs.role != PSA_PAKE_ROLE_SERVER) {
+        return PSA_ERROR_NOT_SUPPORTED;
+    }
+
     /* Clear driver context */
     mbedtls_platform_zeroize(&operation->data, sizeof(operation->data));
 

library/psa_crypto_pake.c

diff --git a/library/psa_crypto_pake.c b/library/psa_crypto_pake.c
index 2d84f57..382f021 100644
--- a/library/psa_crypto_pake.c
+++ b/library/psa_crypto_pake.c
@@ -221,13 +221,6 @@
             return PSA_ERROR_NOT_SUPPORTED;
         }
 
-        if (role != PSA_PAKE_ROLE_CLIENT &&
-            role != PSA_PAKE_ROLE_SERVER) {
-            return PSA_ERROR_NOT_SUPPORTED;
-        }
-
-
-
         operation->password = mbedtls_calloc(1, password_len);
         if (operation->password == NULL) {
             status = PSA_ERROR_INSUFFICIENT_MEMORY;