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

PasswordRecipientInfoBuilder for CMS #1273

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c0c3195
Implemented PasswordRecipientInfoBuilder for cms
bkstein Nov 30, 2023
d819cd4
Clippy and rustfmt
bkstein Nov 30, 2023
a3a6708
Link RFC 3211
bkstein Dec 4, 2023
ee851f5
Improve code readability
bkstein Dec 4, 2023
7b23a0f
Fix construction of `wrapped_cek`
bkstein Dec 4, 2023
d0a4f8e
Changed `PwriEncryptor` return types to Result<>
bkstein Dec 5, 2023
b505f04
Merge branch 'master' of https://github.com/RustCrypto/formats into c…
bkstein Dec 5, 2023
0abe441
Fixed type declaration
bkstein Dec 5, 2023
572d2d0
Removed debugging code.
bkstein Dec 6, 2023
7cd04da
Fixed key derivation for PwriEncryptor in test
bkstein Dec 7, 2023
33f7abb
Adding CEK to wrapped key.
bkstein Dec 8, 2023
86c7e2e
Fixed appending CEK to wrapped CEK.
bkstein Dec 8, 2023
483f977
Fixed padded key length calculation
bkstein Dec 11, 2023
7126d8e
Added decryption in Pwri test
bkstein Dec 13, 2023
32fd0e1
Clippy...
bkstein Dec 13, 2023
f56f075
Fixed invalid encoding of rsaEncryption AlgorithmIdentifier
bkstein Dec 19, 2023
603ca6d
cms: do not hold a mutable reference to Rng
baloo Dec 3, 2023
14ca4dd
Merge branch 'master' into cms/pwri-builder
bkstein Apr 22, 2024
ed0aa1c
Fixed a clippy
bkstein Apr 25, 2024
49d443c
Trigger build
bkstein May 2, 2024
b29c6c8
Merge branch 'master' into cms/pwri-builder
bkstein May 2, 2024
ffb8356
Cargo.lock update
bkstein May 2, 2024
88e3f59
Merge branch 'master' into cms/pwri-builder
bkstein Jul 16, 2024
ad8f402
Saving work
bkstein Jul 24, 2024
c624f74
Update to current master
kletterstein Jul 27, 2024
ebf849d
Updated pwri changes in cms.
kletterstein Jul 27, 2024
66a4e7c
Fixed Cargo.lock
kletterstein Jul 27, 2024
4117ae4
Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder
kletterstein Jul 27, 2024
a51145c
Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder
kletterstein Jul 28, 2024
b62fc35
Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder
kletterstein Jul 28, 2024
8044862
Fixing dependency versions (aes)
kletterstein Jul 28, 2024
201ddbb
Fixed clippies
kletterstein Jul 28, 2024
d57c3ab
Before update to official master
kletterstein Oct 13, 2024
cbd8f27
Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder
kletterstein Oct 13, 2024
5fdf587
Saving work before baloo merge
kletterstein Oct 13, 2024
765e447
Merge remote-tracking branch 'baloolocal/cms/pwri-builder' into cms/p…
kletterstein Oct 15, 2024
05c23aa
Fixed some merge errors
kletterstein Oct 15, 2024
33cf7a6
PwriRecipientInfoBuilder test completed
kletterstein Oct 16, 2024
85845d7
Formatting
kletterstein Oct 16, 2024
48e0a4e
Rustfmt
kletterstein Oct 16, 2024
e374257
Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder
kletterstein Oct 16, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ target/

# CLion IDE
.idea

# VS Code IDE
.vscode
1 change: 1 addition & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions cms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ signature = { version = "=2.3.0-pre.4", features = ["digest", "alloc"], optional
zeroize = { version = "1.8.1", optional = true }

[dev-dependencies]
aes = "=0.9.0-pre.2"
getrandom = "0.2"
hex-literal = "0.4"
pem-rfc7468 = "1.0.0-rc.1"
pkcs5 = "0.8.0-rc.1"
pbkdf2 = "0.13.0-pre.0"
rand = "0.8.5"
rsa = { version = "=0.10.0-pre.3", features = ["sha2"] }
ecdsa = { version = "=0.17.0-pre.9", features = ["digest", "pem"] }
Expand Down
Loading
Loading