Update to upstream

.gitignore

@@ -1,2 +1,9 @@
 target/
 Cargo.lock
+
+#IntelliJ project files
+.idea
+*.iml
+
+CMakeLists.txt
+cmake-build-debug

.travis.yml

@@ -1,23 +1,53 @@
 language: rust
-sudo: false
+cache: 
+  directories:
+  - cargo_web
 
-matrix:
-  include:
-    - rust: stable
-    - rust: beta
-    - rust: nightly
+rust:
+  - stable
+  - beta
+  - nightly
+  - 1.22.0
+os:
+ - linux
+ - windows
 
-install:
-  - |
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH=$HOME/.local/bin:$PATH
+addons:
+  chrome: stable
 
-script:
-  - |
-      travis-cargo build &&
-      travis-cargo build -- --release &&
-      travis-cargo test &&
-      travis-cargo test -- --release &&
-      travis-cargo bench &&
-      travis-cargo --only stable doc
+matrix:
+  exclude:
+  - rust: 1.22.0
+    os: windows
 
+script:
+  - cargo build --verbose --no-default-features
+  - cargo build --verbose --no-default-features --features="serde"
+  - cargo build --verbose --no-default-features --features="lowmemory"
+  - 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=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"
+  - cargo test --verbose --features="rand serde recovery endomorphism"
+  - cargo build --verbose
+  - cargo test --verbose
+  - cargo build --verbose --release
+  - cargo test --verbose --release
+  - cargo run --example sign_verify
+  - cargo run --example sign_verify_recovery --features=recovery
+  - cargo run --example generate_keys --features=rand
+  - if [ ${TRAVIS_RUST_VERSION} == "stable" ]; then cargo doc --verbose --features="rand,serde,recovery,endomorphism"; fi
+  - if [ ${TRAVIS_RUST_VERSION} == "nightly" ]; then cargo test --verbose --benches --features=unstable; fi
+  - if [ ${TRAVIS_RUST_VERSION} == "nightly" -a "$TRAVIS_OS_NAME" = "linux" ]; then 
+    cd no_std_test &&
+    cargo run --release | grep -q "Verified Successfully";
+    fi
+  - if [ ${TRAVIS_RUST_VERSION} == "stable" -a "$TRAVIS_OS_NAME" = "linux" ]; then 
+    CARGO_TARGET_DIR=cargo_web cargo install --verbose --force cargo-web && 
+    cargo web build --verbose --target=asmjs-unknown-emscripten && 
+    cargo web test --verbose --target=asmjs-unknown-emscripten; 
+    fi

CHANGELOG.md

@@ -0,0 +1,118 @@
+
+# 0.17.2
+- Fix linking in the `fuzztarget` feature.
+
+# 0.17.1
+
+- Correctly prefix the secp256k1-sys links field in Cargo.toml.
+
+# 0.17.0
+
+- Move FFI into secp256k1-sys crate.
+- Add `external-symbols` feature for not building upstream.
+- Add functions to create a context from a raw pointer.
+- Support passing custom hash functions to ECDH.
+- Wrap Secp256k1 from raw context in a ManuallyDrop.
+
+# 0.15.4 - 2019-09-06
+
+- Add `rand-std` feature.
+- Pin the cc build-dep version to `< 1.0.42` to remain
+  compatible with rustc 1.22.0.
+- Changed all `as_*ptr()` to a new safer `CPtr` trait
+
+# 0.15.2 - 2019-08-08
+
+- Add feature `lowmemory` that reduces the EC mult window size to require
+  significantly less memory for the validation context (~680B instead of
+  ~520kB), at the cost of slower validation. It does not affect the speed of
+  signing, nor the size of the signing context.
+
+# 0.15.0 - 2019-07-25
+
+* Implement hex human-readable serde for PublicKey
+* Implement fmt::LowerHex for SecretKey and PublicKey
+* Relax `cc` dependency requirements
+* Add links manifest key to prevent cross-version linkage
+
+# 0.14.1 - 2019-07-14
+
+* Implemented FFI functions: `secp256k1_context_create` and `secp256k1_context_destroy` in rust.
+
+# 0.14.0 - 2019-07-08
+
+* [Feature-gate endormorphism optimization](https://github.com/rust-bitcoin/rust-secp256k1/pull/120)
+  because of a lack of clarity with respect to patents
+* Got full no-std support including eliminating all use of libc in C bindings.
+  [PR 1](https://github.com/rust-bitcoin/rust-secp256k1/pull/115)
+  [PR 2](https://github.com/rust-bitcoin/rust-secp256k1/pull/125).
+  This library should be usable in bare-metal environments and with rust-wasm.
+  Thanks to Elichai Turkel for driving this forward!
+* Update upstream libsecp256k1 version to 143dc6e9ee31852a60321b23eea407d2006171da
+
+# 0.13.0 - 2019-05-21
+
+* Update minimum supported rust compiler 1.22.
+* Replace `serialize_der` function with `SerializedSignature` struct.
+* Allow building without a standard library (`no_std`). `std` feature is on by default.
+* Add human readable serialization to `Signatures` and `SecretKeys`.
+* Stop displaying 0 bytes if a `Signature` is less than 72 bytes.
+* Only compile recovery module if feature `recovery` is set (non-default).
+* Update `rand` dependency from 0.4 to 0.6 and add `rand_core` 0.4 dependency.
+* Relax `cc` dependency requirements.
+
+# 0.12.2 - 2019-01-18
+
+* Fuzzer bug fix
+
+# 0.12.1 - 2019-01-15
+
+* Minor bug fixes
+* Fixed `cc` crate version to maintain minimum compiler version without breakage
+* Removed `libc` dependency as it our uses have been subsumed into stdlib
+
+# 0.12.0 - 2018-12-03
+
+* **Overhaul API to remove context object when no precomputation is needed**
+* Add `ThirtyTwoByteHash` trait which allows infallible conversions to `Message`s
+* Disallow 0-valued `Message` objects since signatures on them are forgeable for all keys
+* Remove `ops::Index` implementations for `Signature`
+* Remove depecated constants and unsafe `ZERO_KEY` constant
+
+# 0.11.5 - 2018-11-09
+
+* Use `pub extern crate` to export dependencies whose types are exported
+
+# 0.11.4 - 2018-11-04
+
+* Add `FromStr` and `Display` for `Signature` and both key types
+* Fix `build.rs` for Windows and rustfmt configuration for docs.rs
+* Correct endianness issue for `Signature` `Debug` output
+
+# 0.11.3 - 2018-10-28
+
+* No changes, just fixed docs.rs configuration
+
+# 0.11.2 - 2018-09-11
+
+* Correct endianness issue in RFC6979 nonce generation
+
+# 0.11.1 - 2018-08-22
+
+* Put `PublicKey::combine` back because it is currently needed to implement Lightning BOLT 3
+
+# 0.11.0 - 2018-08-22
+
+* Update `rand` to 0.4 and `gcc` 0.3 to `cc` 1.0. (`rand` 0.5 exists but has a lot of breaking changes and no longer compiles with 1.14.0.)
+* Remove `PublicKey::combine` from API since it cannot be used with anything else in the API
+* Detect whether 64-bit compilation is possible, and do it if we can (big performance improvement)
+
+# 0.10.0 - 2018-07-25
+
+* A [complete API overhaul](https://github.com/rust-bitcoin/rust-secp256k1/pull/27) to move many runtime errors into compiletime errors
+* Update [libsecp256k1 to `1e6f1f5ad5e7f1e3ef79313ec02023902bf8`](https://github.com/rust-bitcoin/rust-secp256k1/pull/32). Should be no visible changes.
+* [Remove `PublicKey::new()` and `PublicKey::is_valid()`](https://github.com/rust-bitcoin/rust-secp256k1/pull/37) since `new` was unsafe and it should now be impossible to create invalid `PublicKey` objects through the API
+* [Reintroduce serde support](https://github.com/rust-bitcoin/rust-secp256k1/pull/38) behind a feature gate using serde 1.0
+* Clean up build process and various typos
+
+

Cargo.toml

@@ -1,36 +1,68 @@
 [package]
 
 name = "secp256k1"
-version = "0.5.4"
+version = "0.17.2"
 authors = [ "Dawid Ciężarkiewicz <[email protected]>",
             "Andrew Poelstra <[email protected]>" ]
 license = "CC0-1.0"
-homepage = "https://github.com/apoelstra/rust-secp256k1/"
-repository = "https://github.com/apoelstra/rust-secp256k1/"
-documentation = "https://www.wpsoftware.net/rustdoc/secp256k1/"
+homepage = "https://github.com/rust-bitcoin/rust-secp256k1/"
+repository = "https://github.com/rust-bitcoin/rust-secp256k1/"
+documentation = "https://docs.rs/secp256k1/"
 description = "Rust bindings for Pieter Wuille's `libsecp256k1` library. Implements ECDSA for the SECG elliptic curve group secp256k1 and related utilities."
 keywords = [ "crypto", "ECDSA", "secp256k1", "libsecp256k1", "bitcoin" ]
 readme = "README.md"
+autoexamples = false # Remove when edition 2018 https://github.com/rust-lang/cargo/issues/5330
 
-build = "build.rs"
-[build-dependencies]
-gcc = "0.3"
+# Should make docs.rs show all functions, even those behind non-default features
+[package.metadata.docs.rs]
+features = [ "rand", "rand-std", "serde", "recovery", "endomorphism" ]
 
 [lib]
 name = "secp256k1"
 path = "src/lib.rs"
 
 [features]
 unstable = []
-default = []
-dev = ["clippy"]
+default = ["std"]
+std = ["secp256k1-sys/std"]
+rand-std = ["rand/std"]
+recovery = ["secp256k1-sys/recovery"]
+endomorphism = ["secp256k1-sys/endomorphism"]
+lowmemory = ["secp256k1-sys/lowmemory"]
+
+# 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"]
 
 [dependencies]
-arrayvec = "0.3"
-clippy = {version = "0.0", optional = true}
-rand = "0.3"
-libc = "0.1"
-rustc-serialize = "0.3"
-serde = "0.6"
-serde_json = "0.6"
+secp256k1-sys = { version = "0.1.1", default-features = false, path = "./secp256k1-sys" }
+
+[dev-dependencies]
+rand = "0.6"
+rand_core = "0.4"
+serde_test = "1.0"
+bitcoin_hashes = "0.7"
+
+[dependencies.rand]
+version = "0.6"
+optional = true
+default-features = false
+
+[dependencies.serde]
+version = "1.0"
+optional = true
+default-features = false
+
+[[example]]
+name = "sign_verify_recovery"
+required-features = ["recovery"]
+
+[[example]]
+name = "sign_verify"
 
+[[example]]
+name = "generate_keys"
+required-features = ["rand"]

README.md

@@ -1,15 +1,23 @@
-[![Build Status](https://travis-ci.org/apoelstra/rust-secp256k1.png?branch=master)](https://travis-ci.org/apoelstra/rust-secp256k1)
+[![Build Status](https://travis-ci.org/rust-bitcoin/rust-secp256k1.png?branch=master)](https://travis-ci.org/rust-bitcoin/rust-secp256k1)
+
+[Full documentation](https://docs.rs/secp256k1/)
 
 ### rust-secp256k1
 
-`rust-secp256k1` is a wrapper around ![libsecp256k1](https://github.com/bitcoin/secp256k1),
-a C library by Peter Wuille for producing ECDSA signatures using the SECG curve
+`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
 * implements key generation
 * implements deterministic nonce generation via RFC6979
 * implements many unit tests, adding to those already present in `libsecp256k1`
 * makes no allocations (except in unit tests) for efficiency and use in freestanding implementations
 
-[Full documentation](https://www.wpsoftware.net/rustdoc/secp256k1/)
+### Contributing
+
+Contributions to this library are welcome. A few guidelines:
 
+* Any breaking changes must have an accompanied entry in CHANGELOG.md
+* No new dependencies, please.
+* No crypto should be implemented in Rust, with the possible exception of hash functions. Cryptographic contributions should be directed upstream to libsecp256k1.
+* This library should always compile with any combination of features on **Rust 1.22**.