Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMS EnvelopedData #1115

Merged
merged 27 commits into from
Aug 26, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6aa7758
Implemented `EnvelopedDataBuilder` (untested)
bkstein Jun 14, 2023
10e4858
`KeyTransRecipientInfo` with RSA encryption
bkstein Jun 21, 2023
d1b5341
Fixed content-encryption algorithm.
bkstein Jun 22, 2023
9bbb936
Test and example for `EnvelopedData` (SCEP PKCSReq).
bkstein Jun 23, 2023
559e880
Merge branch 'master' of https://github.com/RustCrypto/formats into c…
bkstein Jun 23, 2023
d335529
Fixed clippy and fmt
bkstein Jun 23, 2023
a602f04
Fixed minimal-versions test
bkstein Jun 23, 2023
b43362f
Custom rng for `EnvelopedData`
bkstein Jun 30, 2023
b7704c1
Merge branch 'master' into cms/enveloped-content
bkstein Jun 30, 2023
e0eaf41
Reverted feature "getrandom"
bkstein Jun 30, 2023
27ff500
rustfmt
bkstein Jun 30, 2023
4bd4ef6
cms scep test checks.
bkstein Jun 30, 2023
1b0f6f8
Cleaning cms builder
bkstein Jul 6, 2023
29ac637
Fixed encoding of `SubjectKeyIdentifier`
bkstein Jul 6, 2023
57c0829
Fixed message_type in builder test
bkstein Jul 6, 2023
46e02db
Harmonized test function naming
bkstein Jul 7, 2023
1c3af42
Removed unneeded trait bound
bkstein Jul 7, 2023
f941000
Fixed file permissions
bkstein Jul 14, 2023
007d33d
Merge branch 'master' into cms/enveloped-content
bkstein Jul 14, 2023
104fa7e
Updated Cargo.lock
bkstein Jul 14, 2023
ce240ef
Added cloning and other derives for ContentEncryptionAlgorithm
bkstein Jul 17, 2023
c7cfa5a
Merge branch 'master' of https://github.com/RustCrypto/formats into c…
bkstein Aug 1, 2023
5c16a4c
Support degenerate certificates-only SignedData
bkstein Aug 1, 2023
9a4c830
Degenerate certificates-only test
bkstein Aug 3, 2023
64c7b82
Fixed a TODO
bkstein Aug 3, 2023
9eb70cc
Rustfmt
bkstein Aug 3, 2023
77b0bdf
Merge branch 'master' into cms/enveloped-content
tarcieri Aug 26, 2023
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
63 changes: 35 additions & 28 deletions Cargo.lock

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

19 changes: 13 additions & 6 deletions cms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,36 @@ edition = "2021"
rust-version = "1.65"

[dependencies]
der = { version = "0.7.6", features = ["alloc", "derive", "oid", "pem"] }
der = { version = "0.7.7", features = ["alloc", "derive", "oid", "pem"] }
spki = { version = "0.7" }
x509-cert = { version = "0.2.3", default-features = false, features = ["pem"] }
const-oid = { version = "0.9", features = ["db"] } # TODO: path = "../const-oid"
tarcieri marked this conversation as resolved.
Show resolved Hide resolved

# optional dependencies
sha1 = { version = "0.10", optional = true}
sha2 = { version = "0.10", optional = true}
sha3 = { version = "0.10", optional = true}
signature = { version = "2.1.0", features = ["digest", "alloc"], optional = true}
aes = { version = "0.8.2", optional = true }
cbc = { version = "0.1.2", optional = true }
cipher = { version = "0.4.4", features = ["alloc", "block-padding", "rand_core"], optional = true }
rsa = { version = "0.9.2", optional = true }
sha1 = { version = "0.10", optional = true }
sha2 = { version = "0.10", optional = true }
sha3 = { version = "0.10", optional = true }
signature = { version = "2.1.0", features = ["digest", "alloc"], optional = true }
zeroize = { version = "1.6.0", optional = true }

[dev-dependencies]
getrandom = "0.2"
hex-literal = "0.4"
pem-rfc7468 = "0.7.0"
pkcs5 = { version = "0.7" }
rand = { version = "0.8.5" }
rsa = { version = "0.9.2", features = ["sha2"] }
ecdsa = { version = "0.16.7", features = ["digest", "pem"] }
p256 = "0.13.0"

[features]
alloc = ["der/alloc"]
std = ["der/std", "spki/std"]
builder = ["sha1", "sha2", "sha3", "signature", "std", "spki/alloc", "x509-cert/builder"]
builder = ["aes", "cbc", "cipher", "rsa", "sha1", "sha2", "sha3", "signature", "std", "spki/alloc", "x509-cert/builder", "zeroize"]
pem = ["alloc", "der/pem"]

[package.metadata.docs.rs]
Expand Down
Loading