diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-09-11 12:44:08 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-09-11 12:44:08 -0700 |
| commit | 894fb33f4c1b24667891f7d2aff9f486177b1173 (patch) | |
| tree | d40b6f9b501a4a387eb07a630d61712bb9193cef /src/secp256k1/contrib | |
| parent | f2d9934381bf89f1746f13cc5f86ae199eaa52bb (diff) | |
| parent | b9c1a7648131c5deec9704ee9acd00ec1820b9ce (diff) | |
Update src/secp256k1 subtree to upstream libsecp256k1
Diffstat (limited to 'src/secp256k1/contrib')
| -rw-r--r-- | src/secp256k1/contrib/lax_der_parsing.c | 1 | ||||
| -rwxr-xr-x | src/secp256k1/contrib/travis.sh | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/secp256k1/contrib/lax_der_parsing.c b/src/secp256k1/contrib/lax_der_parsing.c index e177a0562d..f71db4b535 100644 --- a/src/secp256k1/contrib/lax_der_parsing.c +++ b/src/secp256k1/contrib/lax_der_parsing.c @@ -112,7 +112,6 @@ int ecdsa_signature_parse_der_lax(const secp256k1_context* ctx, secp256k1_ecdsa_ return 0; } spos = pos; - pos += slen; /* Ignore leading zeroes in R */ while (rlen > 0 && input[rpos] == 0) { diff --git a/src/secp256k1/contrib/travis.sh b/src/secp256k1/contrib/travis.sh index 3909d16a27..b0b55b44b8 100755 --- a/src/secp256k1/contrib/travis.sh +++ b/src/secp256k1/contrib/travis.sh @@ -3,10 +3,6 @@ set -e set -x -if [ -n "$HOST" ] -then - export USE_HOST="--host=$HOST" -fi if [ "$HOST" = "i686-linux-gnu" ] then export CC="$CC -m32" @@ -18,9 +14,11 @@ fi ./configure \ --enable-experimental="$EXPERIMENTAL" --enable-endomorphism="$ENDOMORPHISM" \ - --with-field="$FIELD" --with-bignum="$BIGNUM" --with-asm="$ASM" --with-scalar="$SCALAR" \ + --with-test-override-wide-multiply="$WIDEMUL" --with-bignum="$BIGNUM" --with-asm="$ASM" \ --enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \ - --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" "$EXTRAFLAGS" "$USE_HOST" + --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \ + --enable-module-schnorrsig="$SCHNORRSIG" \ + --host="$HOST" $EXTRAFLAGS if [ -n "$BUILD" ] then |