Skip to content

elliptic-curve: complete digest v0.11.0-rc.0 upgrade #1870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
May 29, 2025
Merged

elliptic-curve: complete digest v0.11.0-rc.0 upgrade #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/elliptic-curve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features bits
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features dev
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features digest
#- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdh
#- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdh
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features jwk
#- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features oprf
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features oprf
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pem
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pkcs8
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features sec1
Expand All @@ -54,7 +54,7 @@ jobs:
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,arithmetic,pkcs8
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,serde
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic,serde
#- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,hash2curve,jwk,oprf,pem,pkcs8,sec1,serde
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,hash2curve,jwk,oprf,pem,pkcs8,sec1,serde

minimal-versions:
# Temporarily disabled until elliptic-curve 0.13.0-pre.0 is published
Expand Down
80 changes: 60 additions & 20 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@ members = [

[patch.crates-io]
digest = { path = "digest" }
hkdf = { git = "https://github.com/RustCrypto/KDFs.git" }
hmac = { git = "https://github.com/RustCrypto/MACs.git" }
sha2 = { git = "https://github.com/RustCrypto/hashes.git" }
sha3 = { git = "https://github.com/RustCrypto/hashes.git" }
signature = { path = "signature" }
12 changes: 6 additions & 6 deletions elliptic-curve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ base64ct = { version = "1", optional = true, default-features = false, features
digest = { version = "0.11.0-rc.0", optional = true }
ff = { version = "=0.14.0-pre.0", optional = true, default-features = false }
group = { version = "=0.14.0-pre.0", optional = true, default-features = false }
#hkdf = { version = "=0.13.0-pre.5", optional = true, default-features = false }
hkdf = { version = "0.13.0-rc.0", optional = true, default-features = false }
hex-literal = { version = "1", optional = true }
pem-rfc7468 = { version = "1.0.0-rc.2", optional = true, features = ["alloc"] }
pkcs8 = { version = "0.11.0-rc.1", optional = true, default-features = false }
Expand All @@ -39,8 +39,8 @@ serde_json = { version = "1.0.121", optional = true, default-features = false, f

[dev-dependencies]
hex-literal = "1"
#sha2 = "=0.11.0-pre.5"
#sha3 = "=0.11.0-pre.5"
sha2 = "0.11.0-rc.0"
sha3 = "0.11.0-rc.0"

[features]
default = ["arithmetic"]
Expand All @@ -62,11 +62,11 @@ std = [
arithmetic = ["group"]
bits = ["arithmetic", "ff/bits"]
dev = ["arithmetic", "dep:hex-literal", "pem", "pkcs8"]
#ecdh = ["arithmetic", "digest", "dep:hkdf"]
ecdh = ["arithmetic", "digest", "dep:hkdf"]
group = ["dep:group", "ff"]
#hash2curve = ["arithmetic", "digest"]
hash2curve = ["arithmetic", "digest"]
jwk = ["dep:base64ct", "dep:serde_json", "alloc", "serde", "zeroize/alloc"]
#oprf = ["digest", "hash2curve"]
oprf = ["digest", "hash2curve"]
pkcs8 = ["dep:pkcs8", "sec1"]
pem = ["dep:pem-rfc7468", "alloc", "arithmetic", "pkcs8", "sec1/pem"]
serde = ["dep:serdect", "alloc", "pkcs8", "sec1/serde"]
Expand Down
16 changes: 8 additions & 8 deletions elliptic-curve/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ pub mod scalar;

#[cfg(feature = "dev")]
pub mod dev;
//#[cfg(feature = "ecdh")]
//pub mod ecdh;
//#[cfg(feature = "hash2curve")]
//pub mod hash2curve;
#[cfg(feature = "ecdh")]
pub mod ecdh;
#[cfg(feature = "hash2curve")]
pub mod hash2curve;
#[cfg(feature = "arithmetic")]
pub mod ops;
#[cfg(feature = "sec1")]
Expand All @@ -112,8 +112,8 @@ mod public_key;
#[cfg(feature = "jwk")]
mod jwk;

//#[cfg(feature = "oprf")]
//mod oprf;
#[cfg(feature = "oprf")]
mod oprf;

pub use crate::{
error::{Error, Result},
Expand Down Expand Up @@ -146,8 +146,8 @@ pub use crate::jwk::{JwkEcKey, JwkParameters};
#[cfg(feature = "pkcs8")]
pub use pkcs8;

//#[cfg(feature = "oprf")]
//pub use crate::oprf::OprfParameters;
#[cfg(feature = "oprf")]
pub use crate::oprf::OprfParameters;

use core::{
fmt::Debug,
Expand Down