check return error

Zondax · Dec 7, 2023 · 6dcdbbc · 6dcdbbc
1 parent 2e623f8
commit 6dcdbbc
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 100 deletions.
diff --git a/app/src/apdu_handler.c b/app/src/apdu_handler.c
@@ -758,13 +758,17 @@ void handleTest(volatile uint32_t *tx) {
 
   jubjub_extendedpoint p;
   jubjub_fq scal;
-  jubjub_field_frombytes(scal, scalar);
+  if (jubjub_field_frombytes(scal, scalar) != zxerr_ok) {
+    *tx = 0;
+    MEMZERO(point, sizeof(point));
+    THROW(APDU_CODE_OK);
+  }
 
   jubjub_extendedpoint_tobytes(point, JUBJUB_GEN);
-  zxerr_t err = jubjub_extendedpoint_frombytes(&p, point);
+  const zxerr_t err = jubjub_extendedpoint_frombytes(&p, point);
   if (err != zxerr_ok) {
     *tx = 0;
-    MEMZERO(point, 32);
+    MEMZERO(point, sizeof(point));
     THROW(APDU_CODE_OK);
   }
   // MEMCPY(&p, &JUBJUB_GEN, 32);

diff --git a/app/src/c_api/rust.c b/app/src/c_api/rust.c
@@ -128,13 +128,12 @@ void c_jubjub_scalarmult(uint8_t *point, const uint8_t *scalar) {
   MEMCPY(scal, scalar, JUBJUB_FIELD_BYTES);
   SWAP_ENDIAN_BYTES(scal);
 
-  zxerr_t err = jubjub_extendedpoint_frombytes(&p, point);
-  if (err != zxerr_ok) {
+  if (jubjub_extendedpoint_frombytes(&p, point) != zxerr_ok ||
+      jubjub_extendedpoint_scalarmult(&p, scal) != zxerr_ok ||
+      jubjub_extendedpoint_tobytes(point, p) != zxerr_ok) {
+
     MEMZERO(point, JUBJUB_FIELD_BYTES);
-    return;
   }
-  jubjub_extendedpoint_scalarmult(&p, scal);
-  jubjub_extendedpoint_tobytes(point, p);
 }
 
 void c_jubjub_spending_base_scalarmult(uint8_t *point, const uint8_t *scalar) {