Skip to content

Commit

Permalink
Merge branch 'RustCrypto:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
JoHaHu authored Nov 27, 2023
2 parents 314bfa7 + 3e5ca6f commit fdb6f5b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion jose-b64/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ serde = ["dep:serde"]
base64ct = { version = "1.6.0", default-features = false, features = ["alloc"] }

# optional dependencies
zeroize = { version = "1.6.0", default-features = false, optional = true, features = ["alloc", "serde"] }
zeroize = { version = "1.7.0", default-features = false, optional = true, features = ["alloc", "serde"] }
serde = { version = "1.0.185", default-features = false, optional = true, features = ["alloc", "derive"] }
serde_json = { version = "1.0.96", default-features = false, optional = true, features = ["alloc"] }
subtle = { version = "2.5.0", default-features = false, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion jose-jwk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ crypto = ["p256", "p384", "p521", "rsa"]
jose-b64 = { version = "0.1", default-features = false, features = ["secret"], path = "../jose-b64" }
jose-jwa = { version = "0.1", path = "../jose-jwa" }
serde = { version = "1.0.185", default-features = false, features = ["alloc", "derive"] }
zeroize = { version = "1.6.0", default-features = false, features = ["alloc"] }
zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }

# optional dependencies
p256 = { version = "0.13.2", default-features = false, optional = true, features = ["arithmetic"] }
Expand Down

0 comments on commit fdb6f5b

Please sign in to comment.