From f0709ac57e60c156d392307936b5d17dd45fc07f Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Wed, 12 Nov 2014 15:41:47 -0800
Subject: [PATCH] Avoid forward static decl of undefined functions, also fix a
 paren warning in the tests.

---
 src/testrand.h                       | 24 ++++++++++++++++++++++++
 src/{util_impl.h => testrand_impl.h} |  6 +++---
 src/tests.c                          |  4 ++--
 src/util.h                           | 12 ------------
 4 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 src/testrand.h
 rename src/{util_impl.h => testrand_impl.h} (94%)

diff --git a/src/testrand.h b/src/testrand.h
new file mode 100644
index 00000000000..07cb2d201ea
--- /dev/null
+++ b/src/testrand.h
@@ -0,0 +1,24 @@
+// Copyright (c) 2013 Pieter Wuille
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef _SECP256K1_TESTRAND_H_
+#define _SECP256K1_TESTRAND_H_
+
+#if defined HAVE_CONFIG_H
+#include "libsecp256k1-config.h"
+#endif
+
+/** Seed the pseudorandom number generator. */
+SECP256K1_INLINE static void secp256k1_rand_seed(uint64_t v);
+
+/** Generate a pseudorandom 32-bit number. */
+static uint32_t secp256k1_rand32(void);
+
+/** Generate a pseudorandom 32-byte array. */
+static void secp256k1_rand256(unsigned char *b32);
+
+/** Generate a pseudorandom 32-byte array with long sequences of zero and one bits. */
+static void secp256k1_rand256_test(unsigned char *b32);
+
+#endif
diff --git a/src/util_impl.h b/src/testrand_impl.h
similarity index 94%
rename from src/util_impl.h
rename to src/testrand_impl.h
index fa01a05cd54..89391873884 100644
--- a/src/util_impl.h
+++ b/src/testrand_impl.h
@@ -2,13 +2,13 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef _SECP256K1_UTIL_IMPL_H_
-#define _SECP256K1_UTIL_IMPL_H_
+#ifndef _SECP256K1_TESTRAND_IMPL_H_
+#define _SECP256K1_TESTRAND_IMPL_H_
 
 #include <stdint.h>
 #include <string.h>
 
-#include "util.h"
+#include "testrand.h"
 
 static uint32_t secp256k1_Rz = 11, secp256k1_Rw = 11;
 
diff --git a/src/tests.c b/src/tests.c
index f3675713dc7..5b07c42a1b8 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "secp256k1.c"
-#include "util_impl.h"
+#include "testrand_impl.h"
 
 #ifdef ENABLE_OPENSSL_TESTS
 #include "openssl/bn.h"
@@ -134,7 +134,7 @@ void test_num_get_set_hex(void) {
         // check whether the lower 4 bits correspond to the last hex character
         int low1 = secp256k1_num_shift(&n1, 4);
         int lowh = c[63];
-        int low2 = (lowh>>6)*9+(lowh-'0')&15;
+        int low2 = ((lowh>>6)*9+(lowh-'0'))&15;
         CHECK(low1 == low2);
         // shift bits off the hex representation, and compare
         memmove(c+1, c, 63);
diff --git a/src/util.h b/src/util.h
index 4fd2616b857..696f24a441a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -44,16 +44,4 @@
 #define VERIFY_CHECK(cond) do { (void)(cond); } while(0)
 #endif
 
-/** Seed the pseudorandom number generator. */
-SECP256K1_INLINE static void secp256k1_rand_seed(uint64_t v);
-
-/** Generate a pseudorandom 32-bit number. */
-static uint32_t secp256k1_rand32(void);
-
-/** Generate a pseudorandom 32-byte array. */
-static void secp256k1_rand256(unsigned char *b32);
-
-/** Generate a pseudorandom 32-byte array with long sequences of zero and one bits. */
-static void secp256k1_rand256_test(unsigned char *b32);
-
 #endif