switch to self-made memcmp

Author: real-or-random

examples/examples_util.h

@@ -126,3 +126,21 @@ static void print_buf_plain(const unsigned char *buf, size_t len) {
     }
     printf("\n}\n");
 }
+
+/** Semantics like memcmp. Variable-time.
+ *
+ * We use this to avoid possible compiler bugs with memcmp, e.g.
+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189
+ */
+static /*SECP256K1_INLINE*/ int secp256k1_memcmp_var(const void *s1, const void *s2, size_t n) {
+    const unsigned char *p1 = s1, *p2 = s2;
+    size_t i;
+
+    for (i = 0; i < n; i++) {
+        int diff = p1[i] - p2[i];
+        if (diff != 0) {
+            return diff;
+        }
+    }
+    return 0;
+}

examples/silentpayments.c

@@ -107,7 +107,7 @@ const unsigned char* label_lookup(
         printf("label = 33\n");
         PRINT_BUF(label33, 33);
         printf("\n\n");
-        if (memcmp(cache->entries[i].label, label33, 33) == 0) {
+        if (secp256k1_var_memcmp(cache->entries[i].label, label33, 33) == 0) {
             return cache->entries[i].label_tweak;
         }
     }

src/modules/silentpayments/main_impl.h

@@ -571,7 +571,7 @@ int secp256k1_silentpayments_recipient_scan_outputs(
                  * label1 = tx_output - P_output */
                 secp256k1_gej_add_ge_var(&label_gej, &tx_output_gej, &P_output_negated_ge, NULL);
                 secp256k1_ge_set_gej(&label_ge, &label_gej);
-                if (!secp256k1_eckey_pubkey_serialize(&label_ge, label33, &len, 1)) { exit(1) }
+                if (!secp256k1_eckey_pubkey_serialize(&label_ge, label33, &len, 1)) { exit(1); }
                 label_tweak = label_lookup(label33, label_context);
                 if (label_tweak != NULL) {
                     found = 1;
@@ -584,7 +584,7 @@ int secp256k1_silentpayments_recipient_scan_outputs(
                  * label2 = -tx_output - P_output */
                 secp256k1_gej_add_ge_var(&label_gej, &label_gej, &P_output_negated_ge, NULL);
                 secp256k1_ge_set_gej(&label_ge, &label_gej);
-                if (!secp256k1_eckey_pubkey_serialize(&label_ge, label33, &len, 1)) { exit(1) }
+                if (!secp256k1_eckey_pubkey_serialize(&label_ge, label33, &len, 1)) { exit(1); }
                 label_tweak = label_lookup(label33, label_context);
                 if (label_tweak != NULL) {
                     found = 1;