Skip to content

Commit

Permalink
Use latest prereleases (#1461)
Browse files Browse the repository at this point in the history
Updates the following dependencies to their latest prerelease versions:

- `aes-gcm` v0.11.0-pre.1
- `async-signature` v0.6.0-pre.4
- `cbc` v0.2.0-pre.1
- `des` v0.9.0-pre.1
- `digest` v0.11.0-pre.9
- `ecdsa` v0.17.0-pre.7
- `pbkdf2` v0.13.0-pre.1
- `scrypt` v0.12.0-pre.1
- `sha1` v0.11.0-pre.4
- `sha2` v0.11.0-pre.4
- `sha3` v0.11.0-pre.4
- `signature` 2.3.0-pre.4
- `whirlpool` v0.11.0-pre.4
  • Loading branch information
tarcieri authored Jul 27, 2024
1 parent cfc34ee commit 9c0e851
Show file tree
Hide file tree
Showing 8 changed files with 203 additions and 461 deletions.
580 changes: 168 additions & 412 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 1 addition & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,4 @@ x509-tsp = { path = "./x509-tsp" }
x509-cert = { path = "./x509-cert" }
x509-ocsp = { path = "./x509-ocsp" }


# Pending a release of 0.14.0-pre.1
p256 = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
# Pending a release of 0.11.0-pre.2
whirlpool = { git = "https://github.com/RustCrypto/hashes.git" }
# Pending a release of 0.11.0-pre
salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
aead = { git = "https://github.com/RustCrypto/traits.git" }

# https://github.com/RustCrypto/formats/pull/1055
# https://github.com/RustCrypto/signatures/pull/809
ecdsa = { git = "https://github.com/RustCrypto/signatures" }

# https://github.com/RustCrypto/password-hashes/pull/489
scrypt = { git = "https://github.com/RustCrypto/password-hashes.git" }
rsa = { git = "https://github.com/RustCrypto/RSA/", branch = "use-latest-prereleases" }
20 changes: 10 additions & 10 deletions cms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ x509-cert = { version = "=0.3.0-pre", default-features = false, features = ["pem
const-oid = { version = "0.10.0-rc.0", features = ["db"] }

# optional dependencies
aes = { version = "=0.9.0-pre", optional = true }
cbc = { version = "=0.2.0-pre.0", optional = true }
cipher = { version = "=0.5.0-pre.4", features = ["alloc", "block-padding", "rand_core"], optional = true }
aes = { version = "=0.9.0-pre.1", optional = true }
cbc = { version = "=0.2.0-pre.1", optional = true }
cipher = { version = "=0.5.0-pre.6", features = ["alloc", "block-padding", "rand_core"], optional = true }
rsa = { version = "=0.10.0-pre.1", optional = true }
sha1 = { version = "=0.11.0-pre.3", optional = true }
sha2 = { version = "=0.11.0-pre.3", optional = true }
sha3 = { version = "=0.11.0-pre.3", optional = true }
signature = { version = "=2.3.0-pre.3", features = ["digest", "alloc"], optional = true }
sha1 = { version = "=0.11.0-pre.4", optional = true }
sha2 = { version = "=0.11.0-pre.4", optional = true }
sha3 = { version = "=0.11.0-pre.4", optional = true }
signature = { version = "=2.3.0-pre.4", features = ["digest", "alloc"], optional = true }
zeroize = { version = "1.8.1", optional = true }

[dev-dependencies]
getrandom = "0.2"
hex-literal = "0.4"
pem-rfc7468 = "=1.0.0-rc.0"
pkcs5 = "=0.8.0-pre.0"
pkcs5 = "=0.8.0-rc.0"
rand = "0.8.5"
rsa = { version = "=0.10.0-pre.1", features = ["sha2"] }
ecdsa = { version = "=0.17.0-pre.5", features = ["digest", "pem"] }
p256 = "=0.14.0-pre.0"
ecdsa = { version = "=0.17.0-pre.7", features = ["digest", "pem"] }
p256 = "=0.14.0-pre.1"

[features]
alloc = ["der/alloc"]
Expand Down
10 changes: 5 additions & 5 deletions pkcs12/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ spki = { version = "0.8.0-rc.0" }
x509-cert = { version = "=0.3.0-pre", default-features = false, features = ["pem"] }
const-oid = { version = "0.10.0-rc.0", features = ["db"] }
cms = "=0.3.0-pre"
digest = { version = "0.11.0-pre.8", features=["alloc"], optional = true }
digest = { version = "0.11.0-pre.9", features = ["alloc"], optional = true }
zeroize = "1.8.1"

[dev-dependencies]
hex-literal = "0.4"
pkcs8 = { version = "=0.11.0-pre.0", features = ["pkcs5", "getrandom"] }
pkcs5 = {version = "=0.8.0-pre.0", features = ["pbes2", "3des"]}
sha2 = "=0.11.0-pre.3"
whirlpool = "=0.11.0-pre.2"
pkcs8 = { version = "=0.11.0-rc.0", features = ["pkcs5", "getrandom"] }
pkcs5 = { version = "=0.8.0-rc.0", features = ["pbes2", "3des"] }
sha2 = "=0.11.0-pre.4"
whirlpool = "=0.11.0-pre.4"

[features]
kdf = ["dep:digest"]
Expand Down
16 changes: 8 additions & 8 deletions pkcs5/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ der = { version = "0.8.0-rc.0", features = ["oid"] }
spki = { version = "0.8.0-rc.0" }

# optional dependencies
cbc = { version = "=0.2.0-pre.0", optional = true }
aes = { version = "=0.9.0-pre", optional = true, default-features = false }
aes-gcm = { version = "=0.11.0-pre.0", optional = true, default-features = false, features = ["aes"] }
des = { version = "=0.9.0-pre.0", optional = true, default-features = false }
pbkdf2 = { version = "=0.13.0-pre.0", optional = true, default-features = false, features = ["hmac"] }
cbc = { version = "=0.2.0-pre.1", optional = true }
aes = { version = "=0.9.0-pre.1", optional = true, default-features = false }
aes-gcm = { version = "=0.11.0-pre.1", optional = true, default-features = false, features = ["aes"] }
des = { version = "=0.9.0-pre.1", optional = true, default-features = false }
pbkdf2 = { version = "=0.13.0-pre.1", optional = true, default-features = false, features = ["hmac"] }
rand_core = { version = "0.6.4", optional = true, default-features = false }
scrypt = { version = "=0.12.0-pre.0", optional = true, default-features = false }
sha1 = { version = "=0.11.0-pre.3", optional = true, default-features = false }
sha2 = { version = "=0.11.0-pre.3", optional = true, default-features = false }
scrypt = { version = "=0.12.0-pre.1", optional = true, default-features = false }
sha1 = { version = "=0.11.0-pre.4", optional = true, default-features = false }
sha2 = { version = "=0.11.0-pre.4", optional = true, default-features = false }

[dev-dependencies]
hex-literal = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion spki/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ der = { version = "0.8.0-rc.0", features = ["oid"] }
# Optional dependencies
arbitrary = { version = "1.2", features = ["derive"], optional = true }
base64ct = { version = "1", optional = true, default-features = false }
sha2 = { version = "=0.11.0-pre.3", optional = true, default-features = false }
sha2 = { version = "=0.11.0-pre.4", optional = true, default-features = false }

[dev-dependencies]
hex-literal = "0.4"
Expand Down
12 changes: 6 additions & 6 deletions x509-cert/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ spki = { version = "0.8.0-rc.0", features = ["alloc"] }

# optional dependencies
arbitrary = { version = "1.3", features = ["derive"], optional = true }
async-signature = { version = "=0.6.0-pre.1", features = ["digest", "rand_core"], optional = true }
sha1 = { version = "0.11.0-pre.2", optional = true }
signature = { version = "=2.3.0-pre.3", features = ["rand_core"], optional = true }
async-signature = { version = "=0.6.0-pre.4", features = ["digest", "rand_core"], optional = true }
sha1 = { version = "0.11.0-pre.4", optional = true }
signature = { version = "=2.3.0-pre.4", features = ["rand_core"], optional = true }
tls_codec = { version = "0.4.0", default-features = false, features = ["derive"], optional = true }

[dev-dependencies]
hex-literal = "0.4"
rand = "0.8.5"
rsa = { version = "=0.10.0-pre.1", features = ["sha2"] }
ecdsa = { version = "=0.17.0-pre.5", features = ["digest", "pem"] }
p256 = "=0.14.0-pre.0"
ecdsa = { version = "=0.17.0-pre.7", features = ["digest", "pem"] }
p256 = "=0.14.0-pre.1"
rstest = "0.21"
sha2 = { version = "=0.11.0-pre.3", features = ["oid"] }
sha2 = { version = "=0.11.0-pre.4", features = ["oid"] }
tempfile = "3.5.0"
tokio = { version = "1.38.1", features = ["macros", "rt"] }
x509-cert-test-support = { path = "./test-support" }
Expand Down
8 changes: 4 additions & 4 deletions x509-ocsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ spki = { version = "0.8.0-rc.0", features = ["alloc"] }
x509-cert = { version = "=0.3.0-pre", default-features = false }

# Optional
digest = { version = "=0.11.0-pre.8", optional = true, default-features = false, features = ["oid"] }
digest = { version = "=0.11.0-pre.9", optional = true, default-features = false, features = ["oid"] }
rand_core = { version = "0.6.4", optional = true, default-features = false }
signature = { version = "=2.3.0-pre.3", optional = true, default-features = false, features = ["digest", "rand_core"] }
signature = { version = "=2.3.0-pre.4", optional = true, default-features = false, features = ["digest", "rand_core"] }

[dev-dependencies]
hex-literal = "0.4.1"
lazy_static = "1.5.0"
rand = "0.8.5"
rsa = { version = "=0.10.0-pre.1", default-features = false, features = ["sha2"] }
sha1 = { version = "=0.11.0-pre.3", default-features = false, features = ["oid"] }
sha2 = { version = "=0.11.0-pre.3", default-features = false, features = ["oid"] }
sha1 = { version = "=0.11.0-pre.4", default-features = false, features = ["oid"] }
sha2 = { version = "=0.11.0-pre.4", default-features = false, features = ["oid"] }

[features]
rand = ["rand_core"]
Expand Down

0 comments on commit 9c0e851

Please sign in to comment.