Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/jose-jwk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
minimal-versions:
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
with:
working-directory: ${{ github.workflow }}
working-directory: ${{ github.workflow }}

no_std:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -57,6 +57,7 @@ jobs:
# Test no features, individual features and all features.
- ""
- crypto
- legacy
- p256
- p384
- rsa
Expand All @@ -70,6 +71,7 @@ jobs:
- p384,rsa
- rsa,p256
- rsa,p384
# TODO(tarcieri): switch to cargo-hack
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths-ignore:
- README.md
push:
branches:
branches:
- master
paths-ignore:
- README.md
Expand All @@ -22,7 +22,7 @@ jobs:
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.65.0
- uses: dtolnay/rust-toolchain@1.89
with:
components: clippy
- run: cargo clippy --all-features --all-targets -- -D warnings
Expand All @@ -41,5 +41,5 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
components: rustfmt
- run: cargo fmt --all -- --check
69 changes: 55 additions & 14 deletions Cargo.lock

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

15 changes: 12 additions & 3 deletions jose-jwk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ rust-version = "1.65"
[features]
default = ["crypto"]
crypto = ["p256", "p384", "p521", "k256", "rsa"]
legacy = ["dep:base64ct", "dep:elliptic-curve", "dep:serde_json", "dep:serdect", "dep:subtle"]

[dependencies]
jose-b64 = { version = "0.1", default-features = false, features = ["secret"], path = "../jose-b64" }
Expand All @@ -30,13 +31,21 @@ zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }
# optional dependencies
p256 = { version = "0.13.2", default-features = false, optional = true, features = ["arithmetic"] }
p384 = { version = "0.13.1", default-features = false, optional = true, features = ["arithmetic"] }
p521 = { version = "0.13.3", default-features = false, optional = true, features = ["arithmetic"]}
k256 = { version = "0.13.4", default-features = false, optional = true, features = ["arithmetic"]}
p521 = { version = "0.13.3", default-features = false, optional = true, features = ["arithmetic"] }
k256 = { version = "0.13.4", default-features = false, optional = true, features = ["arithmetic"] }
rsa = { version = "0.9", default-features = false, optional = true }
url = { version = "2.4.1", default-features = false, optional = true, features = ["serde"] }

# legacy dependencies
base64ct = { version = "1", optional = true, default-features = false, features = ["alloc"] }
elliptic-curve = { version = "0.13", optional = true, default-features = false, features = ["arithmetic", "sec1"] }
serdect = { version = "0.2", optional = true, default-features = false, features = ["alloc"] }
serde_json = { version = "1.0.121", optional = true, default-features = false, features = ["alloc"] }
subtle = { version = "2.6", optional = true, default-features = false }

[dev-dependencies]
serde_json = "1.0.96"
elliptic-curve = { version = "0.13", default-features = false, features = ["dev"] }
serde_json = "1.0.121"

[package.metadata.docs.rs]
all-features = true
Expand Down
Loading