Skip to content

Commit 48a2f2b

Browse files
baloobaloo
authored
pkcs1+pkcs5+pkcs8+sec1+spki: rc releases (#1847)
* pkcs1+pkcs5+pkcs8+sec1+spki: rc releases - `pkcs1` 0.8.0-rc.2 - `pkcs5` 0.8.0-rc.4 - `pkcs8` 0.11.0-rc.4 - `sec1` 0.8.0-rc.5 - `spki` 0.8.0-rc.2
1 parent 0d763fc commit 48a2f2b

File tree

19 files changed

+128
-678
lines changed

19 files changed

+128
-678
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ members = [
44
"base16ct",
55
"base32ct",
66
"base64ct",
7-
"cmpv2",
8-
"cms",
7+
#"cmpv2",
8+
#"cms",
99
"const-oid",
10-
"crmf",
10+
#"crmf",
1111
"der",
1212
"der_derive",
13-
"gss-api",
13+
#"gss-api",
1414
"pem-rfc7468",
1515
"pkcs1",
1616
"pkcs5",
@@ -22,6 +22,16 @@ members = [
2222
"tai64",
2323
"tls_codec",
2424
"tls_codec/derive",
25+
#"x509-tsp",
26+
#"x509-cert",
27+
#"x509-cert/test-support",
28+
#"x509-ocsp"
29+
]
30+
exclude = [
31+
"cmpv2",
32+
"cms",
33+
"crmf",
34+
"gss-api",
2535
"x509-tsp",
2636
"x509-cert",
2737
"x509-cert/test-support",
@@ -58,56 +68,3 @@ tls_codec_derive = { path = "./tls_codec/derive" }
5868
x509-tsp = { path = "./x509-tsp" }
5969
x509-cert = { path = "./x509-cert" }
6070
x509-ocsp = { path = "./x509-ocsp" }
61-
62-
63-
# https://github.com/RustCrypto/signatures/pull/913
64-
# https://github.com/RustCrypto/signatures/pull/923
65-
ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
66-
rfc6979 = { git = "https://github.com/RustCrypto/signatures.git" }
67-
# https://github.com/RustCrypto/key-wraps/pull/34
68-
# https://github.com/RustCrypto/key-wraps/pull/35
69-
# https://github.com/RustCrypto/key-wraps/pull/39
70-
aes-kw = { git = "https://github.com/RustCrypto/key-wraps.git" }
71-
72-
73-
# https://github.com/RustCrypto/KDFs/pull/102
74-
ansi-x963-kdf = { git = "https://github.com/RustCrypto/KDFs.git" }
75-
hkdf = { git = "https://github.com/RustCrypto/KDFs.git" }
76-
77-
78-
# https://github.com/RustCrypto/traits/pull/1777
79-
crypto-common = { git = "https://github.com/RustCrypto/traits.git" }
80-
elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
81-
signature = { git = "https://github.com/RustCrypto/traits.git" }
82-
aead = { git = "https://github.com/RustCrypto/traits.git" }
83-
digest = { git = "https://github.com/RustCrypto/traits.git" }
84-
85-
# https://github.com/RustCrypto/RSA/pull/478
86-
# https://github.com/RustCrypto/RSA/pull/504
87-
rsa = { git = "https://github.com/RustCrypto/RSA.git" }
88-
89-
# https://github.com/RustCrypto/password-hashes/pull/577
90-
# https://github.com/RustCrypto/password-hashes/pull/578
91-
# https://github.com/RustCrypto/password-hashes/pull/592
92-
pbkdf2 = { git = "https://github.com/RustCrypto/password-hashes.git" }
93-
scrypt = { git = "https://github.com/RustCrypto/password-hashes.git" }
94-
95-
crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" }
96-
crypto-primes = { git = "https://github.com/entropyxyz/crypto-primes.git" }
97-
98-
# https://github.com/RustCrypto/elliptic-curves/pull/1125
99-
# https://github.com/RustCrypto/elliptic-curves/pull/1131
100-
primefield = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
101-
p256 = { git = "https://github.com/RustCrypto/elliptic-curves.git" }
102-
103-
cbc = { git = "https://github.com/RustCrypto/block-modes.git" }
104-
ctr = { git = "https://github.com/RustCrypto/block-modes.git" }
105-
aes-gcm = { git = "https://github.com/RustCrypto/AEADs.git" }
106-
salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
107-
108-
sha1 = { git = "https://github.com/RustCrypto/hashes.git" }
109-
sha2 = { git = "https://github.com/RustCrypto/hashes.git" }
110-
sha3 = { git = "https://github.com/RustCrypto/hashes.git" }
111-
whirlpool = { git = "https://github.com/RustCrypto/hashes.git" }
112-
113-
hmac = { git = "https://github.com/RustCrypto/MACs.git" }

‎cmpv2/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rust-version = "1.85"
1717

1818
[dependencies]
1919
crmf = "=0.3.0-pre.0"
20-
der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "flagset", "oid"] }
20+
der = { version = "0.8.0-rc.3", features = ["alloc", "derive", "flagset", "oid"] }
2121
spki = { version = "0.8.0-rc.0" }
2222
x509-cert = { version = "=0.3.0-pre.0", default-features = false }
2323

‎cms/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rust-version = "1.85"
1616

1717
[dependencies]
1818
const-oid = { version = "0.10", features = ["db"] }
19-
der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "oid"] }
19+
der = { version = "0.8.0-rc.3", features = ["alloc", "derive", "oid"] }
2020
spki = { version = "0.8.0-rc.0" }
2121
x509-cert = { version = "=0.3.0-pre.0", default-features = false }
2222

‎crmf/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rust-version = "1.85"
1717

1818
[dependencies]
1919
cms = "=0.3.0-pre.0"
20-
der = { version = "0.8.0-rc.0", features = ["alloc", "derive"] }
20+
der = { version = "0.8.0-rc.3", features = ["alloc", "derive"] }
2121
spki = "0.8.0-rc.0"
2222
x509-cert = { version = "=0.3.0-pre.0", default-features = false }
2323

‎gss-api/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ edition = "2024"
1616
rust-version = "1.85"
1717

1818
[dependencies]
19-
der = { version = "0.8.0-rc.0", features = ["oid", "alloc"] }
19+
der = { version = "0.8.0-rc.3", features = ["oid", "alloc"] }
2020
spki = { version = "0.8.0-rc.0" }
2121
x509-cert = { version = "=0.3.0-pre.0", default-features = false }
2222

2323
[dev-dependencies]
24-
der = { version = "0.8.0-rc.0", features = ["oid", "pem", "alloc"] }
24+
der = { version = "0.8.0-rc.3", features = ["oid", "pem", "alloc"] }
2525
hex-literal = "1"
2626
x509-cert = { version = "=0.3.0-pre.0", default-features = false, features = ["pem"] }
2727

‎pkcs1/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pkcs1"
3-
version = "0.8.0-rc.1"
3+
version = "0.8.0-rc.2"
44
description = """
55
Pure Rust implementation of Public-Key Cryptography Standards (PKCS) #1:
66
RSA Cryptography Specifications Version 2.2 (RFC 8017)
@@ -16,7 +16,7 @@ edition = "2024"
1616
rust-version = "1.85"
1717

1818
[dependencies]
19-
der = { version = "0.8.0-rc.0", features = ["oid"] }
19+
der = { version = "0.8.0-rc.3", features = ["oid"] }
2020
spki = { version = "0.8.0-rc.0" }
2121

2222
# optional dependencies

‎pkcs12/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ edition = "2024"
1616
rust-version = "1.85"
1717

1818
[dependencies]
19-
der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "oid"], default-features = false }
19+
der = { version = "0.8.0-rc.3", features = ["alloc", "derive", "oid"], default-features = false }
2020
spki = { version = "0.8.0-rc.0", default-features = false }
2121
x509-cert = { version = "=0.3.0-pre.0", default-features = false }
2222
const-oid = { version = "0.10.0", features = ["db"], default-features = false }
2323
cms = { version = "=0.3.0-pre.0", default-features = false }
2424

2525
# optional dependencies
26-
digest = { version = "0.11.0-pre.10", features = ["alloc"], optional = true }
26+
digest = { version = "0.11.0-rc.0", features = ["alloc"], optional = true }
2727
zeroize = { version = "1.8.1", optional = true, default-features = false }
2828

2929
[dev-dependencies]
3030
hex-literal = "1"
3131
pkcs8 = { version = "0.11.0-rc.1", features = ["pkcs5", "getrandom"] }
3232
pkcs5 = { version = "0.8.0-rc.0", features = ["pbes2", "3des"] }
33-
sha2 = "=0.11.0-pre.5"
34-
whirlpool = "=0.11.0-pre.5"
33+
sha2 = "0.11.0-rc.0"
34+
whirlpool = "0.11.0-rc.0"
3535

3636
[features]
3737
default = ["pem"]

‎pkcs5/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pkcs5"
3-
version = "0.8.0-rc.3"
3+
version = "0.8.0-rc.4"
44
description = """
55
Pure Rust implementation of Public-Key Cryptography Standards (PKCS) #5:
66
Password-Based Cryptography Specification Version 2.1 (RFC 8018)
@@ -16,19 +16,19 @@ edition = "2024"
1616
rust-version = "1.85"
1717

1818
[dependencies]
19-
der = { version = "0.8.0-rc.0", features = ["oid"] }
19+
der = { version = "0.8.0-rc.3", features = ["oid"] }
2020
spki = { version = "0.8.0-rc.0" }
2121

2222
# optional dependencies
23-
cbc = { version = "=0.2.0-pre.2", optional = true }
24-
aes = { version = "=0.9.0-pre.3", optional = true, default-features = false }
25-
aes-gcm = { version = "=0.11.0-pre.2", optional = true, default-features = false, features = ["aes"] }
26-
des = { version = "=0.9.0-pre.3", optional = true, default-features = false }
27-
pbkdf2 = { version = "=0.13.0-pre.1", optional = true, default-features = false, features = ["hmac"] }
23+
cbc = { version = "0.2.0-rc.0", optional = true }
24+
aes = { version = "0.9.0-rc.0", optional = true, default-features = false }
25+
aes-gcm = { version = "0.11.0-rc.0", optional = true, default-features = false, features = ["aes"] }
26+
des = { version = "0.9.0-rc.0", optional = true, default-features = false }
27+
pbkdf2 = { version = "0.13.0-rc.0", optional = true, default-features = false, features = ["hmac"] }
2828
rand_core = { version = "0.9", optional = true, default-features = false }
29-
scrypt = { version = "=0.12.0-pre.2", optional = true, default-features = false }
30-
sha1 = { version = "=0.11.0-pre.5", optional = true, default-features = false }
31-
sha2 = { version = "=0.11.0-pre.5", optional = true, default-features = false }
29+
scrypt = { version = "0.12.0-rc.1", optional = true, default-features = false }
30+
sha1 = { version = "0.11.0-rc.0", optional = true, default-features = false }
31+
sha2 = { version = "0.11.0-rc.0", optional = true, default-features = false }
3232

3333
[dev-dependencies]
3434
hex-literal = "1"

‎pkcs5/src/pbes2.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl Parameters {
176176
let mut salt = [0u8; Self::DEFAULT_SALT_LEN];
177177
rng.fill_bytes(&mut salt);
178178

179-
scrypt::Params::new(14, 8, 1, 32)
179+
scrypt::Params::new(14, 8, 1)
180180
.ok()
181181
.and_then(|params| Self::scrypt_aes256cbc(params, &salt, iv).ok())
182182
.expect("invalid scrypt parameters")

0 commit comments

Comments
 (0)