Add Ecdsa adaptor and schnorr signature from temp-everything branch

.github/workflows/rust.yml

@@ -0,0 +1,82 @@
+on: [push, pull_request]
+
+name: Continuous integration
+
+jobs:
+  bench_nightly:
+    name: Nightly - ASan + Bench
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - nightly
+    steps:
+      - name: Checkout Crate 
+        uses: actions/checkout@v2
+      - name: Checkout Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rust-src
+      - name: Running address sanitizer
+        env:
+          DO_ASAN: true
+        run: ./contrib/test.sh
+      - name: Running benchmarks
+        env:
+          DO_BENCH: true
+        run: ./contrib/test.sh
+
+  wasm: 
+    name: Stable - Docs / WebAssembly Build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v2
+      - name: Checkout Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - name: Building docs
+        env:
+          DO_DOCS: true
+        run: ./contrib/test.sh
+      - name: Running WASM build
+        env:
+          DO_WASM: true
+        run: ./contrib/test.sh
+
+  Tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - 1.29.0
+          - beta
+          - stable
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v2
+      - name: Checkout Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - name: Pin cc if rust 1.29
+        if: matrix.rust == '1.29.0'
+        run: cargo generate-lockfile --verbose && cargo update -p cc --precise "1.0.41" --verbose
+      - name: Running cargo
+        env:
+          DO_FEATURE_MATRIX: true
+        run: ./contrib/test.sh
+

CHANGELOG.md

@@ -1,4 +1,17 @@
 
+# 0.20.0 - 2020-12-21
+
+* [remove `ffi::PublicKey::blank`](https://github.com/rust-bitcoin/rust-secp256k1/pull/232) and replace with unsafe [`ffi::PublicKey::new` and `ffi::PublicKey::from_array_unchecked`](https://github.com/rust-bitcoin/rust-secp256k1/pull/253/); similar for all other FFI types
+* [support wasm32-wasi target](https://github.com/rust-bitcoin/rust-secp256k1/pull/242)
+* [make the global-context feature depend on the rand-std feature](https://github.com/rust-bitcoin/rust-secp256k1/pull/246)
+* [add a lexicographic ordering to `PublicKey`](https://github.com/rust-bitcoin/rust-secp256k1/pull/248) which does **not** match the ordering used by Bitcoin Core (matching this would be impossible as it requires tracking a compressedness flag, which libsecp256k1 does not have)
+* [implement BIP340 Schnorr signatures](https://github.com/rust-bitcoin/rust-secp256k1/pull/237)
+* [require use of new `AlignedType` in preallocated-context API to enforce alignment requirements](https://github.com/rust-bitcoin/rust-secp256k1/pull/233); previously it was possible to get UB by using misaligned memory stores
+* [enforce correct alignment when using preallocated context API](https://github.com/rust-bitcoin/rust-secp256k1/pull/233)
+* [stop using cargo features for dangerous build-breaking options, require setting `RUSTFLAGS` instead](https://github.com/rust-bitcoin/rust-secp256k1/pull/263)
+* [implement low-R signing and function to grind even smaller signatures](https://github.com/rust-bitcoin/rust-secp256k1/pull/259)
+* [remove endomorphism feature, following upstream in enabling it by default](https://github.com/rust-bitcoin/rust-secp256k1/pull/257)
+
 # 0.19.0 - 2020-08-27
 
 * **Update MSRV to 1.29.0**

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secp256k1"
-version = "0.19.0"
+version = "0.20.1-adaptor.0"
 authors = [ "Dawid Ciężarkiewicz <[email protected]>",
             "Andrew Poelstra <[email protected]>" ]
 license = "CC0-1.0"
@@ -14,27 +14,19 @@ autoexamples = false # Remove when edition 2018 https://github.com/rust-lang/car
 
 # Should make docs.rs show all functions, even those behind non-default features
 [package.metadata.docs.rs]
-features = [ "rand", "rand-std", "serde", "recovery", "endomorphism" ]
+features = [ "rand", "rand-std", "serde", "recovery" ]
 
 [features]
 unstable = ["recovery", "rand-std"]
 default = ["std"]
 std = ["secp256k1-sys/std"]
 rand-std = ["rand/std"]
 recovery = ["secp256k1-sys/recovery"]
-endomorphism = ["secp256k1-sys/endomorphism"]
 lowmemory = ["secp256k1-sys/lowmemory"]
-global-context = ["std", "rand"]
-
-# Use this feature to not compile the bundled libsecp256k1 C symbols,
-# but use external ones. Use this only if you know what you are doing!
-external-symbols = ["secp256k1-sys/external-symbols"]
-
-# Do not use this feature! HAZMAT. (meant for Fuzzing only. this is *BROKEN CRYPTOGRAPHY*)
-fuzztarget = ["secp256k1-sys/fuzztarget"]
+global-context = ["std", "rand-std"]
 
 [dependencies]
-secp256k1-sys = { version = "0.3.1", default-features = false, path = "./secp256k1-sys" }
+secp256k1-sys = { version = "0.4.0-adaptor-0", default-features = false, path = "./secp256k1-sys" }
 bitcoin_hashes = { version = "0.9", optional = true }
 rand = { version = "0.6", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, optional = true }
@@ -61,3 +53,11 @@ name = "sign_verify"
 [[example]]
 name = "generate_keys"
 required-features = ["rand"]
+
+[workspace]
+members = ["secp256k1-sys"]
+exclude = ["no_std_test"]
+
+[[example]]
+name = "ecdsa_adaptor"
+required-features = ["rand", "bitcoin_hashes"]

README.md

@@ -4,7 +4,7 @@
 
 ### rust-secp256k1
 
-`rust-secp256k1` is a wrapper around ![libsecp256k1](https://github.com/bitcoin-core/secp256k1),
+`rust-secp256k1` is a wrapper around [libsecp256k1](https://github.com/bitcoin-core/secp256k1),
 a C library by Pieter Wuille for producing ECDSA signatures using the SECG curve
 `secp256k1`. This library
 * exposes type-safe Rust bindings for all `libsecp256k1` functions
@@ -35,3 +35,14 @@ before_script:
     cargo generate-lockfile --verbose && cargo update -p cc --precise "1.0.41" --verbose;
     fi
 ```
+
+## Fuzzing
+
+If you want to fuzz this library, or any library which depends on it, you will
+probably want to disable the actual cryptography, since fuzzers are unable to
+forge signatures and therefore won't test many interesting codepaths. To instead
+use a trivially-broken but fuzzer-accessible signature scheme, compile with
+`--cfg=fuzzing` in your `RUSTFLAGS` variable.
+
+Note that `cargo hfuzz` sets this config flag automatically.
+

contrib/test.sh

@@ -0,0 +1,85 @@
+#!/bin/sh -ex
+
+FEATURES="bitcoin_hashes global-context lowmemory rand rand-std recovery serde"
+
+# Use toolchain if explicitly specified
+if [ -n "$TOOLCHAIN" ]
+then
+    alias cargo="cargo +$TOOLCHAIN"
+fi
+
+cargo --version
+rustc --version
+
+# Make all cargo invocations verbose
+export CARGO_TERM_VERBOSE=true
+
+# Defaults / sanity checks
+cargo build --all
+cargo test --all
+
+if [ "$DO_FEATURE_MATRIX" = true ]; then
+    cargo build --all --no-default-features
+    #This doesn't work but probably should --andrew
+    #cargo test --all --no-default-features
+
+    # All features
+    cargo build --all --no-default-features --features="$FEATURES"
+    cargo test --all --features="$FEATURES"
+    # Single features
+    for feature in ${FEATURES}
+    do
+        cargo build --all --no-default-features --features="$feature"
+        cargo test --all --features="$feature"
+    done
+
+    # Other combos 
+    RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS=$RUSTFLAGS cargo test --all
+    RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS=$RUSTFLAGS cargo test --all --features="$FEATURES"
+    cargo test --all --features="rand rand-std"
+    cargo test --all --features="rand serde"
+
+    if [ "$DO_BENCH" = true ]; then  # proxy for us having a nightly compiler
+        cargo test --all --all-features
+        RUSTFLAGS='--cfg=fuzzing' RUSTDOCFLAGS='--cfg=fuzzing' cargo test --all --all-features
+    fi
+
+    # Examples
+    cargo run --example sign_verify
+    cargo run --example sign_verify_recovery --features=recovery
+    cargo run --example generate_keys --features=rand
+fi
+
+# Docs
+if [ "$DO_DOCS" = true ]; then
+    cargo doc --all --features="$FEATURES"
+fi
+
+# Webassembly stuff
+if [ "$DO_WASM" = true ]; then
+    clang --version &&
+    CARGO_TARGET_DIR=wasm cargo install --force wasm-pack &&
+    printf '\n[lib]\ncrate-type = ["cdylib", "rlib"]\n' >> Cargo.toml &&
+    CC=clang-9 wasm-pack build &&
+    CC=clang-9 wasm-pack test --node;
+fi
+
+# Address Sanitizer
+if [ "$DO_ASAN" = true ]; then
+    cargo clean
+    CC='clang -fsanitize=address -fno-omit-frame-pointer'                                        \
+    RUSTFLAGS='-Zsanitizer=address -Clinker=clang -Cforce-frame-pointers=yes'                    \
+    ASAN_OPTIONS='detect_leaks=1 detect_invalid_pointer_pairs=1 detect_stack_use_after_return=1' \
+    cargo test --lib --all --features="$FEATURES" -Zbuild-std --target x86_64-unknown-linux-gnu &&
+    cargo clean &&
+    CC='clang -fsanitize=memory -fno-omit-frame-pointer'                                         \
+    RUSTFLAGS='-Zsanitizer=memory -Zsanitizer-memory-track-origins -Cforce-frame-pointers=yes'   \
+    cargo test --lib --all --features="$FEATURES" -Zbuild-std --target x86_64-unknown-linux-gnu &&
+    cargo run --release --manifest-path=./no_std_test/Cargo.toml | grep -q "Verified Successfully"
+fi
+
+# Bench
+if [ "$DO_BENCH" = true ]; then
+    cargo bench --all --features="unstable"
+fi
+