Skip to content

Commit

Permalink
Bump elliptic-curve crate to v0.7; ecdsa to v0.9 (#247)
Browse files Browse the repository at this point in the history
  • Loading branch information
tarcieri authored Dec 6, 2020
1 parent 4c38198 commit 000dbeb
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 30 deletions.
19 changes: 8 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ members = [
"p256",
"p384",
]

[patch.crates-io]
ecdsa = { git = "https://github.com/RustCrypto/signatures" }
elliptic-curve = { git = "https://github.com/RustCrypto/traits" }
8 changes: 4 additions & 4 deletions k256/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ signing/verification (including Ethereum-style signatures with public-key
recovery), Elliptic Curve Diffie-Hellman (ECDH), and general purpose secp256k1
curve arithmetic useful for implementing arbitrary group-based protocols.
"""
version = "0.5.10"
version = "0.6.0-pre"
authors = ["RustCrypto Developers"]
license = "Apache-2.0 OR MIT"
documentation = "https://docs.rs/elliptic-curve"
Expand All @@ -18,14 +18,14 @@ keywords = ["bitcoin", "crypto", "ecc", "ethereum", "secp256k1"]

[dependencies]
cfg-if = "1.0"
ecdsa-core = { version = "=0.9.0-pre", package = "ecdsa", optional = true, default-features = false }
elliptic-curve = { version = "=0.7.0-pre", default-features = false }
ecdsa-core = { version = "0.9", package = "ecdsa", optional = true, default-features = false }
elliptic-curve = { version = "0.7", default-features = false }
sha2 = { version = "0.9", optional = true, default-features = false }
sha3 = { version = "0.9", optional = true, default-features = false }

[dev-dependencies]
criterion = "0.3"
ecdsa-core = { version = "=0.9.0-pre", package = "ecdsa", default-features = false, features = ["dev"] }
ecdsa-core = { version = "0.9", package = "ecdsa", default-features = false, features = ["dev"] }
hex = "0.4" # TODO: switch to hex-literal
hex-literal = "0.2"
num-bigint = "0.3"
Expand Down
8 changes: 4 additions & 4 deletions p256/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Pure Rust implementation of the NIST P-256 (a.k.a. secp256r1, prime256v1)
elliptic curve with support for ECDH, ECDSA signing/verification, and general
purpose curve arithmetic
"""
version = "0.5.2"
version = "0.6.0-pre"
authors = ["RustCrypto Developers"]
license = "Apache-2.0 OR MIT"
documentation = "https://docs.rs/elliptic-curve"
Expand All @@ -16,12 +16,12 @@ categories = ["cryptography", "no-std"]
keywords = ["crypto", "ecc", "nist", "prime256v1", "secp256r1"]

[dependencies]
ecdsa-core = { version = "=0.9.0-pre", package = "ecdsa", optional = true, default-features = false }
elliptic-curve = { version = "=0.7.0-pre", default-features = false }
ecdsa-core = { version = "0.9", package = "ecdsa", optional = true, default-features = false }
elliptic-curve = { version = "0.7", default-features = false }
sha2 = { version = "0.9", optional = true, default-features = false }

[dev-dependencies]
ecdsa-core = { version = "=0.9.0-pre", package = "ecdsa", default-features = false, features = ["dev"] }
ecdsa-core = { version = "0.9", package = "ecdsa", default-features = false, features = ["dev"] }
hex = "0.4" # TODO: switch to hex-literal
hex-literal = "0.3"
proptest = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion p256/src/ecdsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ mod tests {
#[test]
fn rfc6979() {
let x = &hex!("c9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721");
let signer = SigningKey::new(x).unwrap();
let signer = SigningKey::from_bytes(x).unwrap();
let signature = signer.sign(b"sample");
assert_eq!(
signature.as_ref(),
Expand Down
4 changes: 2 additions & 2 deletions p384/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ categories = ["cryptography", "no-std"]
keywords = ["crypto", "ecc", "nist", "secp384r1"]

[dependencies]
ecdsa = { version = "=0.9.0-pre", optional = true, default-features = false }
elliptic-curve = { version = "=0.7.0-pre", default-features = false }
ecdsa = { version = "0.9", optional = true, default-features = false }
elliptic-curve = { version = "0.7", default-features = false }
sha2 = { version = "0.9", optional = true, default-features = false }

[features]
Expand Down
4 changes: 0 additions & 4 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ members = [
"p256_no_std",
"p384_no_std",
]

[patch.crates-io]
ecdsa = { git = "https://github.com/RustCrypto/signatures" }
elliptic-curve = { git = "https://github.com/RustCrypto/traits" }

0 comments on commit 000dbeb

Please sign in to comment.