Skip to content

Commit e548ad0

Browse files
committed
Merge remote-tracking branch 'rust-crypto/master'
2 parents c6f73c3 + 7c6af87 commit e548ad0

File tree

22 files changed

+58
-1475
lines changed

22 files changed

+58
-1475
lines changed

.github/workflows/elliptic-curve.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ jobs:
4343
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features dev
4444
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features digest
4545
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features ecdh
46-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hash2curve
4746
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features jwk
48-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features oprf
4947
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pem
5048
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features pkcs8
5149
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features sec1
@@ -54,7 +52,7 @@ jobs:
5452
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,arithmetic,pkcs8
5553
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,serde
5654
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features arithmetic,serde
57-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,hash2curve,jwk,oprf,pem,pkcs8,sec1,serde
55+
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features alloc,digest,ecdh,jwk,pem,pkcs8,sec1,serde
5856

5957
minimal-versions:
6058
# Temporarily disabled until elliptic-curve 0.13.0-pre.0 is published

.github/workflows/workspace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- uses: actions/checkout@v4
55-
- uses: crate-ci/typos@v1.33.1
55+
- uses: crate-ci/typos@v1.34.0

Cargo.lock

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,3 @@ members = [
1717
[patch.crates-io]
1818
digest = { path = "digest" }
1919
signature = { path = "signature" }
20-
21-
der = { git = "https://github.com/RustCrypto/formats.git" }
22-
pkcs8 = { git = "https://github.com/RustCrypto/formats.git" }
23-
sec1 = { git = "https://github.com/RustCrypto/formats.git" }

elliptic-curve/Cargo.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elliptic-curve"
3-
version = "0.14.0-rc.7"
3+
version = "0.14.0-rc.10"
44
authors = ["RustCrypto Developers"]
55
edition = "2024"
66
rust-version = "1.85"
@@ -18,7 +18,7 @@ and public/secret keys composed thereof.
1818

1919
[dependencies]
2020
base16ct = "0.2"
21-
crypto-bigint = { version = "=0.7.0-pre.5", default-features = false, features = ["rand_core", "hybrid-array", "zeroize"] }
21+
crypto-bigint = { version = "=0.7.0-pre.6", default-features = false, features = ["rand_core", "hybrid-array", "zeroize"] }
2222
hybrid-array = { version = "0.3", default-features = false, features = ["zeroize"] }
2323
rand_core = { version = "0.9.0", default-features = false }
2424
subtle = { version = "2.6", default-features = false }
@@ -32,8 +32,8 @@ group = { version = "=0.14.0-pre.0", optional = true, default-features = false }
3232
hkdf = { version = "0.13.0-rc.0", optional = true, default-features = false }
3333
hex-literal = { version = "1", optional = true }
3434
pem-rfc7468 = { version = "1.0.0-rc.2", optional = true, features = ["alloc"] }
35-
pkcs8 = { version = "0.11.0-rc.1", optional = true, default-features = false }
36-
sec1 = { version = "0.8.0-rc.4", optional = true, features = ["subtle", "zeroize"] }
35+
pkcs8 = { version = "0.11.0-rc.6", optional = true, default-features = false }
36+
sec1 = { version = "0.8.0-rc.8", optional = true, features = ["subtle", "zeroize"] }
3737
serdect = { version = "0.3", optional = true, default-features = false, features = ["alloc"] }
3838
serde_json = { version = "1.0.121", optional = true, default-features = false, features = ["alloc"] }
3939

@@ -64,12 +64,10 @@ bits = ["arithmetic", "ff/bits"]
6464
dev = ["arithmetic", "dep:hex-literal", "pem", "pkcs8"]
6565
ecdh = ["arithmetic", "digest", "dep:hkdf"]
6666
group = ["dep:group", "ff"]
67-
hash2curve = ["arithmetic", "digest"]
6867
jwk = ["dep:base64ct", "dep:serde_json", "alloc", "serde", "zeroize/alloc"]
69-
oprf = ["digest", "hash2curve"]
7068
pkcs8 = ["dep:pkcs8", "sec1"]
71-
pem = ["dep:pem-rfc7468", "alloc", "arithmetic", "pkcs8", "sec1/pem"]
69+
pem = ["dep:pem-rfc7468", "alloc", "arithmetic", "pkcs8/pem", "sec1/pem"]
7270
serde = ["dep:serdect", "alloc", "pkcs8", "sec1/serde"]
7371

7472
[package.metadata.docs.rs]
75-
features = ["bits", "ecdh", "hash2curve", "jwk", "oprf", "pem", "std"]
73+
features = ["bits", "ecdh", "jwk", "pem", "std"]

elliptic-curve/src/hash2curve.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

elliptic-curve/src/hash2curve/group_digest.rs

Lines changed: 0 additions & 98 deletions
This file was deleted.

elliptic-curve/src/hash2curve/hash2field.rs

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)