depend tree patches

Author: surinder83singh

depend/secp256k1/src/ecmult.h

@@ -17,7 +17,7 @@ typedef struct {
     secp256k1_ge_storage (*pre_g_128)[]; /* odd multiples of 2^128*generator */
 } secp256k1_ecmult_context;
 
-static const size_t SECP256K1_ECMULT_CONTEXT_PREALLOCATED_SIZE;
+//static const size_t SECP256K1_ECMULT_CONTEXT_PREALLOCATED_SIZE;
 static void secp256k1_ecmult_context_init(secp256k1_ecmult_context *ctx);
 static void secp256k1_ecmult_context_build(secp256k1_ecmult_context *ctx, void **prealloc);
 static void secp256k1_ecmult_context_finalize_memcpy(secp256k1_ecmult_context *dst, const secp256k1_ecmult_context *src);

depend/secp256k1/src/ecmult_gen.h

@@ -35,7 +35,7 @@ typedef struct {
     secp256k1_gej initial;
 } secp256k1_ecmult_gen_context;
 
-static const size_t SECP256K1_ECMULT_GEN_CONTEXT_PREALLOCATED_SIZE;
+//static const size_t SECP256K1_ECMULT_GEN_CONTEXT_PREALLOCATED_SIZE;
 static void secp256k1_ecmult_gen_context_init(secp256k1_ecmult_gen_context* ctx);
 static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context* ctx, void **prealloc);
 static void secp256k1_ecmult_gen_context_finalize_memcpy(secp256k1_ecmult_gen_context *dst, const secp256k1_ecmult_gen_context* src);

depend/secp256k1/src/modules/schnorrsig/main_impl.h

@@ -45,7 +45,7 @@ static void secp256k1_nonce_function_bip340_sha256_tagged_aux(secp256k1_sha256 *
 
 /* algo16 argument for nonce_function_bip340 to derive the nonce exactly as stated in BIP-340
  * by using the correct tagged hash function. */
-static const unsigned char bip340_algo16[16] = "BIP0340/nonce\0\0\0";
+static const unsigned char bip340_algo16[17] = "BIP0340/nonce\0\0\0";
 
 static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, const unsigned char *xonly_pk32, const unsigned char *algo16, void *data) {
     secp256k1_sha256 sha;
@@ -58,7 +58,7 @@ static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *ms
 
     if (data != NULL) {
         secp256k1_nonce_function_bip340_sha256_tagged_aux(&sha);
-        secp256k1_sha256_write(&sha, data, 32);
+        secp256k1_sha256_write(&sha, (const unsigned char *)data, 32);
         secp256k1_sha256_finalize(&sha, masked_key);
         for (i = 0; i < 32; i++) {
             masked_key[i] ^= key32[i];

depend/secp256k1/src/secp256k1.c

@@ -24,7 +24,7 @@
 #include "selftest.h"
 
 #ifdef SECP256K1_NO_BUILD
-# error "secp256k1.h processed without SECP256K1_BUILD defined while building secp256k1.c"
+//# error "secp256k1.h processed without SECP256K1_BUILD defined while building secp256k1.c"
 #endif
 
 #if defined(VALGRIND)

depend/secp256k1/src/util.h

@@ -222,7 +222,8 @@ static SECP256K1_INLINE void secp256k1_memczero(void *s, size_t len, int flag) {
  * 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;
+    /*
+    const void *p1 = s1, *p2 = s2;
     size_t i;
 
     for (i = 0; i < n; i++) {
@@ -232,6 +233,8 @@ static SECP256K1_INLINE int secp256k1_memcmp_var(const void *s1, const void *s2,
         }
     }
     return 0;
+    */
+    return memcmp(s1, s2, n);
 }
 
 /** If flag is true, set *r equal to *a; otherwise leave it. Constant-time.  Both *r and *a must be initialized and non-negative.*/