Swap algA and algB names

jiep · Feb 15, 2022 · 6e19366 · 6e19366
1 parent 6c6b796
commit 6e19366
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/gake.c b/src/gake.c
@@ -46,8 +46,8 @@ void two_ake(OQS_KEM* kem, uint8_t *ekA1, uint8_t *ekB1, uint8_t *dkA1, uint8_t
   uint8_t *kA1_prime = malloc(kem->length_shared_secret);
 
   ake_init(kem, dkA1, ekB1, cA1, kA1, ekA2, dkA2);
-  ake_algA(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB);
-  ake_algB(kem, cB1, cB2, dkA1, dkA2, kA1, skA);
+  ake_algB(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB);
+  ake_algA(kem, cB1, cB2, dkA1, dkA2, kA1, skA);
 
   // Delete secrets and free
   OQS_MEM_secure_free(dkA2, kem->length_secret_key);

diff --git a/src/gcwr-ake.c b/src/gcwr-ake.c
@@ -49,7 +49,7 @@ void ake_init(OQS_KEM* kem,
   OQS_MEM_secure_free(coins, kem->length_coins);
 }
 
-void ake_algA(OQS_KEM* kem,
+void ake_algB(OQS_KEM* kem,
               const uint8_t* ekA1,
               const uint8_t* ekA2,
               const uint8_t* dkB1,
@@ -102,7 +102,7 @@ void ake_algA(OQS_KEM* kem,
   OQS_MEM_secure_free(coins, kem->length_coins);
 }
 
-void ake_algB(OQS_KEM* kem,
+void ake_algA(OQS_KEM* kem,
               const uint8_t* cB1,
               const uint8_t* cB2,
               const uint8_t* dkA1,

diff --git a/src/gcwr-ake.h b/src/gcwr-ake.h
@@ -22,7 +22,7 @@ void ake_init(OQS_KEM* kem,
               uint8_t* ekA2,
               uint8_t* dkA2);
 
-void ake_algA(OQS_KEM* kem,
+void ake_algB(OQS_KEM* kem,
               const uint8_t* ekA1,
               const uint8_t* ekA2,
               const uint8_t* dkB1,
@@ -34,7 +34,7 @@ void ake_algA(OQS_KEM* kem,
               uint8_t* kA1,
               uint8_t* skB);
 
-void ake_algB(OQS_KEM* kem,
+void ake_algA(OQS_KEM* kem,
               const uint8_t* cB1,
               const uint8_t* cB2,
               const uint8_t* dkA1,

diff --git a/test/test-gcwr-ake.c b/test/test-gcwr-ake.c
@@ -68,7 +68,7 @@ int main(void) {
     uint8_t *skB = malloc(kem->length_shared_secret);
     uint8_t *kA1_prime = malloc(kem->length_shared_secret);
 
-    ake_algA(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB);
+    ake_algB(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB);
     printf("[U_B] kA1: ");
     print_hex_short(kA1_prime, kem->length_shared_secret, MAX);
 
@@ -77,7 +77,7 @@ int main(void) {
     // -----------------------------------------------
     // Alg B
     uint8_t *skA = malloc(kem->length_shared_secret);
-    ake_algB(kem, cB1, cB2, dkA1, dkA2, kA1, skA);
+    ake_algA(kem, cB1, cB2, dkA1, dkA2, kA1, skA);
 
     clock_t end_algA = times(NULL);
 

diff --git a/test/test_speed_ake.c b/test/test_speed_ake.c
@@ -89,13 +89,13 @@ static OQS_STATUS ake_speed_wrapper(const char *method_name, int iterations, boo
   )
 
   TIME_OPERATION_ITERATIONS(
-    ake_algA(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB),
+    ake_algB(kem, ekA1, ekA2, dkB1, kB1, kB2, cA1, cB1, cB2, kA1_prime, skB),
     "algA",
     iterations
   )
 
   TIME_OPERATION_ITERATIONS(
-    ake_algB(kem, cB1, cB2, dkA1, dkA2, kA1, skA),
+    ake_algA(kem, cB1, cB2, dkA1, dkA2, kA1, skA),
     "algB",
     iterations
   )