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

Build SignedData CMS (and PKCS #7) #1051

Merged
merged 31 commits into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
97d95ea
Added SHA-3 OIDs.
bkstein Apr 14, 2023
c664cc7
Saving work
bkstein Apr 14, 2023
0b2df17
Open issue: builder lifetimes
bkstein May 5, 2023
e88075a
Updated rsa depenedency
kletterstein May 6, 2023
06f7b62
Merge branch 'master' into bk/pkcs7-signing
bkstein May 8, 2023
dae6fe6
Merge branch 'bk/pkcs7-signing' of https://github.com/bkstein/RustCry…
bkstein May 8, 2023
a5f6f2c
Builder for signed data works (untested, no content creation support)
bkstein May 12, 2023
861a680
SignerInfoBuilder compiles.
bkstein May 23, 2023
5352740
Fixed test for cms signed data builder
bkstein May 24, 2023
09eef80
Added "builder" feature for cms.
bkstein May 24, 2023
bba8096
Merge branch 'master' into bk/pkcs7-signing
bkstein May 24, 2023
b973107
Use `SetOfVec::try_from` for making `RelativeDistinguishedName` from …
bkstein May 25, 2023
40fd001
Reverted changes in crate pkcs7
bkstein May 25, 2023
a5ad455
Renamed test function
bkstein May 25, 2023
288c9eb
Merge branch 'bk/pkcs7-signing' of https://github.com/bkstein/RustCry…
bkstein May 25, 2023
c851b0d
Moved `der_sort()` back.
bkstein May 25, 2023
5ee8065
Fixed dependency feature definitions
bkstein May 25, 2023
283d7cf
Rustfmt
bkstein May 25, 2023
6365a59
Deactivated builder feature for cms build due to problems with std crate
bkstein May 25, 2023
dbb6bd1
Derive signature oid from signer.
bkstein May 25, 2023
b343dd5
Clippy fix
bkstein May 26, 2023
1745252
Finished TODO
bkstein May 26, 2023
ff06687
Reverting `der_sort` to private
bkstein May 26, 2023
bbf6d38
Re-trigger build (network problems)
bkstein May 26, 2023
3b95f52
Removed irrelevant changes.
bkstein May 26, 2023
93606f2
Merge branch 'master' into bk/pkcs7-signing
bkstein May 30, 2023
09a2624
Update cms/Cargo.toml:x509-cert version
bkstein May 31, 2023
29ddb67
Update cms/Cargo.toml: ecdsa version
bkstein May 31, 2023
f7f1a6b
Update cms/Cargo.toml: rsa version
bkstein May 31, 2023
266b517
Reverted obsolete rfc5652 in const-oid.
bkstein May 31, 2023
e5cb963
Reverted changes on const-oid/oiddbgen/Cargo.lock.
bkstein Jun 1, 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
2 changes: 1 addition & 1 deletion .github/workflows/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
toolchain: ${{ matrix.rust }}
targets: ${{ matrix.target }}
- uses: RustCrypto/actions/cargo-hack-install@master
- run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features arbitrary,default,std
- run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features arbitrary,default,std,builder

minimal-versions:
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
Expand Down
52 changes: 46 additions & 6 deletions Cargo.lock

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

14 changes: 12 additions & 2 deletions cms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,27 @@ rust-version = "1.65"
[dependencies]
der = { version = "0.7.6", features = ["alloc", "derive", "oid", "pem"] }
spki = { version = "0.7" }
x509-cert = { version = "0.2", default-features = false, features = ["pem"] }
x509-cert = { version = "0.2.3", default-features = false, features = ["pem"] }
const-oid = { version = "0.9", features = ["db"] } # TODO: path = "../const-oid"

# 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}

[dev-dependencies]
hex-literal = "0.4"
pem-rfc7468 = "0.7.0"
pkcs5 = { version = "0.7" }
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"]
pem = ["alloc", "der/pem"]

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