From 89271c9c3c7da3c834057104b80a91561874dfc6 Mon Sep 17 00:00:00 2001 From: Elichai Turkel Date: Thu, 9 Jan 2020 14:47:31 +0200 Subject: [PATCH 1/2] Fix fuzztarget symbols --- .travis.yml | 2 +- secp256k1-sys/src/lib.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9537422..83f2bb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,8 @@ script: - cargo build --verbose --no-default-features --features="rand" - cargo build --verbose --no-default-features --features="rand serde recovery endomorphism" - cargo build --verbose --no-default-features --features="fuzztarget recovery" - - cargo build --verbose --features=fuzztarget - cargo build --verbose --features=rand + - cargo test --no-run --features=fuzztarget - cargo test --verbose --features=rand - cargo test --verbose --features="rand rand-std" - cargo test --verbose --features="rand serde" diff --git a/secp256k1-sys/src/lib.rs b/secp256k1-sys/src/lib.rs index 6b02ff7..7844464 100644 --- a/secp256k1-sys/src/lib.rs +++ b/secp256k1-sys/src/lib.rs @@ -444,10 +444,14 @@ mod fuzz_dummy { SECP256K1_START_NONE, SECP256K1_START_VERIFY, SECP256K1_START_SIGN, SECP256K1_SER_COMPRESSED, SECP256K1_SER_UNCOMPRESSED}; + #[allow(non_upper_case_globals)] + pub static secp256k1_context_no_precomp: &Context = &Context(0); + extern "C" { + #[cfg_attr(not(feature = "external-symbols"), link_name = "rustsecp256k1_v0_1_1_ecdh_hash_function_default")] pub static secp256k1_ecdh_hash_function_default: EcdhHashFn; + #[cfg_attr(not(feature = "external-symbols"), link_name = "rustsecp256k1_v0_1_1_nonce_function_rfc6979")] pub static secp256k1_nonce_function_rfc6979: NonceFn; - pub static secp256k1_context_no_precomp: *const Context; } // Contexts From 8f52bacb4a1857c5cd0cd901e1740246b36db548 Mon Sep 17 00:00:00 2001 From: Elichai Turkel Date: Thu, 9 Jan 2020 17:08:39 +0200 Subject: [PATCH 2/2] Bump version to 0.17.2 --- CHANGELOG.md | 3 +++ Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3825e41..a100a8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ +# 0.17.2 +- Fix linking in the `fuzztarget` feature. + # 0.17.1 - Correctly prefix the secp256k1-sys links field in Cargo.toml. diff --git a/Cargo.toml b/Cargo.toml index 220aebc..da4fbed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "secp256k1" -version = "0.17.1" +version = "0.17.2" authors = [ "Dawid Ciężarkiewicz ", "Andrew Poelstra " ] license = "CC0-1.0"