Merge 93cc036 into merged_master (Elements PR ElementsProject#1248)

Author: delta1

configure.ac

@@ -705,6 +705,7 @@ case $host in
        AC_MSG_ERROR([windres not found])
      fi
 
+     CPPFLAGS="$CPPFLAGS -DSECP256K1_STATIC"
      CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
 
      dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.

src/secp256k1/Makefile.am

@@ -269,10 +269,6 @@ if ENABLE_MODULE_BPPP
 include src/modules/bppp/Makefile.am.include
 endif
 
-if ENABLE_MODULE_BPPP
-include src/modules/bppp/Makefile.am.include
-endif
-
 if ENABLE_MODULE_ECDH
 include src/modules/ecdh/Makefile.am.include
 endif

src/secp256k1/src/modules/bppp/tests_impl.h

@@ -257,10 +257,8 @@ static void test_serialize_two_points(void) {
         random_group_element_test(&R);
         secp256k1_bppp_serialize_points(buf, &X, &R);
 
-        buf[0] = 4 + (unsigned char)secp256k1_testrandi64(0, 253);
-        /* Assert that buf[0] is actually invalid. */
-        CHECK(buf[0] != 0x02 && buf[0] != 0x03);
-
+        /* buf is valid if 0 <= buf[0] < 4. */
+        buf[0] = (unsigned char)secp256k1_testrandi64(4, 255);
         CHECK(!secp256k1_bppp_parse_one_of_points(&X_tmp, buf, 0));
         CHECK(!secp256k1_bppp_parse_one_of_points(&R_tmp, buf, 0));
     }