commit 18cd6c908ccb4db980db1005236f58a38e122d7b
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Mon Mar 06 15:40:35 2023 +0100
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Sun Mar 12 16:59:28 2023 +0100
tree 17d4dd56b24276ea6188a474d25fe77b8e5c4c3e
parent aa1834254e8ab7e73a350a1858595e9b8ce55b07

Use local macros for j-pake slient/server strings

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 d21a823..dea2a36 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -91,6 +91,10 @@
 #define BUILTIN_ALG_ANY_HKDF 1
 #endif
 
+/* JPAKE user/peer ids. */
+#define JPAKE_SERVER_ID "server"
+#define JPAKE_CLIENT_ID "client"
+
 /****************************************************************/
 /* Global data, support functions and library management */
 /****************************************************************/
@@ -7402,8 +7406,8 @@
     }
 
     /* Allow only "client" or "server" values (temporary restriction). */
-    if (memcmp(peer_id, PSA_JPAKE_SERVER_ID, peer_id_len) != 0 &&
-        memcmp(peer_id, PSA_JPAKE_CLIENT_ID, peer_id_len) != 0) {
+    if (memcmp(user_id, JPAKE_SERVER_ID, user_id_len) != 0 &&
+        memcmp(user_id, JPAKE_CLIENT_ID, user_id_len) != 0) {
         status = PSA_ERROR_NOT_SUPPORTED;
         goto exit;
     }
@@ -7446,8 +7450,8 @@
     }
 
     /* Allow only "client" or "server" values (temporary restriction). */
-    if (memcmp(user_id, PSA_JPAKE_SERVER_ID, user_id_len) != 0 &&
-        memcmp(user_id, PSA_JPAKE_CLIENT_ID, user_id_len) != 0) {
+    if (memcmp(peer_id, JPAKE_SERVER_ID, peer_id_len) != 0 &&
+        memcmp(peer_id, JPAKE_CLIENT_ID, peer_id_len) != 0) {
         status = PSA_ERROR_NOT_SUPPORTED;
         goto exit;
     }
@@ -7568,12 +7572,12 @@
     }
 
     if (operation->alg == PSA_ALG_JPAKE) {
-        if (memcmp(inputs.user, PSA_JPAKE_CLIENT_ID, inputs.user_len) == 0 &&
-            memcmp(inputs.peer, PSA_JPAKE_SERVER_ID, inputs.peer_len) == 0) {
+        if (memcmp(inputs.user, JPAKE_CLIENT_ID, inputs.user_len) == 0 &&
+            memcmp(inputs.peer, JPAKE_SERVER_ID, inputs.peer_len) == 0) {
             inputs.role = PSA_PAKE_ROLE_CLIENT;
         } else
-        if (memcmp(inputs.user, PSA_JPAKE_SERVER_ID, inputs.user_len) == 0 &&
-            memcmp(inputs.peer, PSA_JPAKE_CLIENT_ID, inputs.peer_len) == 0) {
+        if (memcmp(inputs.user, JPAKE_SERVER_ID, inputs.user_len) == 0 &&
+            memcmp(inputs.peer, JPAKE_CLIENT_ID, inputs.peer_len) == 0) {
             inputs.role = PSA_PAKE_ROLE_SERVER;
         }
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 2d5d529..4a351f3 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -61,6 +61,10 @@
                                                       psa_generic_status_to_mbedtls)
 #endif
 
+/* JPAKE user/peer ids. */
+#define JPAKE_SERVER_ID "server"
+#define JPAKE_CLIENT_ID "client"
+
 #if defined(MBEDTLS_TEST_HOOKS)
 static mbedtls_ssl_chk_buf_ptr_args chk_buf_ptr_fail_args;
 
@@ -1972,15 +1976,15 @@
     }
 
     if (ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER) {
-        user = (uint8_t *) PSA_JPAKE_SERVER_ID;
-        user_len = strlen(PSA_JPAKE_SERVER_ID);
-        peer = (uint8_t *) PSA_JPAKE_CLIENT_ID;
-        peer_len = strlen(PSA_JPAKE_CLIENT_ID);
+        user = (uint8_t *) JPAKE_SERVER_ID;
+        user_len = strlen(JPAKE_SERVER_ID);
+        peer = (uint8_t *) JPAKE_CLIENT_ID;
+        peer_len = strlen(JPAKE_CLIENT_ID);
     } else {
-        user = (uint8_t *) PSA_JPAKE_CLIENT_ID;
-        user_len = strlen(PSA_JPAKE_CLIENT_ID);
-        peer = (uint8_t *) PSA_JPAKE_SERVER_ID;
-        peer_len = strlen(PSA_JPAKE_SERVER_ID);
+        user = (uint8_t *) JPAKE_CLIENT_ID;
+        user_len = strlen(JPAKE_CLIENT_ID);
+        peer = (uint8_t *) JPAKE_SERVER_ID;
+        peer_len = strlen(JPAKE_SERVER_ID);
     }
 
     status = psa_pake_set_user(&ssl->handshake->psa_pake_ctx, user, user_len);