Squashed 'src/secp256k1/' changes from 53ad841..43dd1f4

43dd1f4 Merge pull request ElementsProject#40 from instagibbs/size_t
6532fa0 Merge pull request ElementsProject#39 from instagibbs/more_builds
2b2429d rangeproof: reduce iteration count in unit tests
12b0e5d Enable more builds with rest of experimental flags
8c444ee use proper types for rangeproof min/max

git-subtree-dir: src/secp256k1
git-subtree-split: 43dd1f4fe732268734f0b4efd8e99ea4ff1e49a1

Author: instagibbs

.travis.yml

@@ -11,9 +11,11 @@ cache:
   - src/java/guava/
 env:
   global:
-    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no  EXPERIMENTAL=no  JNI=no
+    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  RECOVERY=no  EXPERIMENTAL=no  JNI=no GENERATOR=no RANGEPROOF=no WHITELIST=no
     - GUAVA_URL=https://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0.jar GUAVA_JAR=src/java/guava/guava-18.0.jar
   matrix:
+    - SCALAR=32bit    FIELD=32bit       EXPERIMENTAL=yes RANGEPROOF=yes WHITELIST=yes GENERATOR=yes
+    - FIELD=64bit     EXPERIMENTAL=yes RANGEPROOF=yes WHITELIST=yes GENERATOR=yes
     - SCALAR=32bit    RECOVERY=yes
     - SCALAR=32bit    FIELD=32bit       ECDH=yes  EXPERIMENTAL=yes
     - SCALAR=64bit
@@ -65,5 +67,5 @@ before_script: ./autogen.sh
 script:
  - if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi
  - if [ "x$HOST" = "xi686-linux-gnu" ]; then export CC="$CC -m32"; fi
- - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-recovery=$RECOVERY --enable-jni=$JNI $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
+ - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-recovery=$RECOVERY --enable-module-rangeproof=$RANGEPROOF --enable-module-whitelist=$WHITELIST --enable-module-generator=$GENERATOR --enable-jni=$JNI $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
 os: linux

src/modules/rangeproof/tests_impl.h

@@ -498,7 +498,7 @@ static void test_rangeproof(void) {
         CHECK(maxv >= v);
     }
     memcpy(&commit2, &commit, sizeof(commit));
-    for (i = 0; i < 10 * (size_t) count; i++) {
+    for (i = 0; i < (size_t) 2*count; i++) {
         int exp;
         int min_bits;
         v = secp256k1_rands64(0, UINT64_MAX >> (secp256k1_rand32()&63));
@@ -526,13 +526,13 @@ static void test_rangeproof(void) {
         }
         CHECK(mlen <= 4096);
         CHECK(memcmp(blindout, blind, 32) == 0);
-        CHECK(vout == v);
+
         CHECK(minv <= v);
         CHECK(maxv >= v);
         CHECK(secp256k1_rangeproof_rewind(ctx, blindout, &vout, NULL, NULL, commit.data, &minv, &maxv, &commit, proof, len, NULL, 0, secp256k1_generator_h));
         memcpy(&commit2, &commit, sizeof(commit));
     }
-    for (j = 0; j < 10; j++) {
+    for (j = 0; j < 5; j++) {
         for (i = 0; i < 96; i++) {
             secp256k1_rand256(&proof[i * 32]);
         }
@@ -656,8 +656,8 @@ void test_rangeproof_fixed_vectors(void) {
         0xf5, 0x1e, 0x0d, 0xc5, 0x86, 0x78, 0x51, 0xa9, 0x00, 0x00, 0xef, 0x4d, 0xe2, 0x94, 0x60, 0x89,
         0x83, 0x04, 0xb4, 0x0e, 0x90, 0x10, 0x05, 0x1c, 0x7f, 0xd7, 0x33, 0x92, 0x1f, 0xe7, 0x74, 0x59
     };
-    size_t min_value_1;
-    size_t max_value_1;
+    uint64_t min_value_1;
+    uint64_t max_value_1;
     secp256k1_pedersen_commitment pc;
 
     CHECK(secp256k1_pedersen_commitment_parse(ctx, &pc, commit_1));