pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned #1483

baloo · 2024-08-18T21:54:33Z

This makes the PrivateKeyInfo generic over its backing storage, and this provides two version of it, namely PrivateKeyInfoRef and PrivateKeyInfoOwned respectively borrowing the value and owning the storage of the value.

followup PRs:

Signed-off-by: Arthur Gautier <[email protected]>

baloo · 2024-08-18T22:01:09Z

pkcs8/src/private_key_info.rs

        reader.read_nested(header.length, |reader| {
            // Parse and validate `version` INTEGER.
            let version = Version::decode(reader)?;
            let algorithm = reader.decode()?;
-            let private_key = OctetStringRef::decode(reader)?.into();
+            let private_key: &[u8] = OctetStringRef::decode(reader)?.into();
+            let private_key = Key::try_from(private_key)?;


yeah, this could be an OctetString or OctetStringRef instead. I don't know what I was thinking last year.

clippy seems to suggest From over TryFrom

Yeah, clippy lead me to rethink my position on OctetString actually.
I rewrote the backing storage in the follow up commit.

baloo · 2024-08-19T07:45:26Z

and that is now causing problems all over the place, sweet.

pkcs8/src/private_key_info.rs

see RustCrypto/formats#1483

baloo · 2024-08-19T17:36:37Z

pkcs8/src/private_key_info.rs

+pub trait BitStringLike {
+    fn as_bit_string(&self) -> BitStringRef<'_>;
+}
+
+impl<'a> BitStringLike for BitStringRef<'a> {
+    fn as_bit_string(&self) -> BitStringRef<'_> {
+        BitStringRef::from(self)
+    }
+}


I could not figure out a way to express this with the traits implemented by both BitStringRef and BitString.

In the interest of getting this PR across the finish line I'll go ahead and merge this, but I think we should definitely find a better solution, and it should go in the der crate.

Something like OwnedToRef but impl'd for both the owned and reference types so it can be used interchangeably, and for any of the *Ref types and not just specialized to BitString*.

Signed-off-by: Arthur Gautier <[email protected]>

tarcieri

Approved with mild dissatisfaction in BitStringLike. Hopefully we can find a better, more general solution.

see RustCrypto/formats#1483

- pkcs1 `0.8.0-rc.1` - pkcs8 `0.11.0-rc.1` - sec1 `0.8.0-rc.1` This comes after the merge of API breaks on pkcs8 ([RustCrypto#1483]) [RustCrypto#1483]: RustCrypto#1483

- pkcs1 `0.8.0-rc.1` - pkcs8 `0.11.0-rc.1` - sec1 `0.8.0-rc.1` This comes after the merge of API breaks on pkcs8 ([#1483]) [#1483]: #1483

This bump the following dependencies: - pkcs8 0.11.0-rc.0 -> 0.11.0-rc.1 - elliptic-curve 0.14.0-pre.6 -> 0.14.0-rc.0 This is a followup on breaking changes made on pkcs8 (RustCrypto/formats#1483).

baloo added 5 commits August 18, 2024 21:46

pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned

53ecc95

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: provide PrivateKeyInfo type alias with older API

5136ffe

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: pem pulls alloc feature

de558e8

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: split EncryptedPrivateKeyInfo

e25f4da

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: Fixup tests

d799384

Signed-off-by: Arthur Gautier <[email protected]>

baloo mentioned this pull request Aug 18, 2024

Tracking issue for generic (e.g. key) types and owned/ref aliases #1117

Open

16 tasks

baloo commented Aug 18, 2024

View reviewed changes

baloo force-pushed the baloo/pkcs8/owned-ref-private-key branch from 71c9927 to 8191fb6 Compare August 19, 2024 07:14

tarcieri reviewed Aug 19, 2024

View reviewed changes

pkcs8/src/private_key_info.rs Outdated Show resolved Hide resolved

baloo added a commit to baloo/signatures that referenced this pull request Aug 19, 2024

ecdsa: pkcs8 API changes

66c355e

see RustCrypto/formats#1483

baloo mentioned this pull request Aug 19, 2024

ecdsa,dsa,ed25519,ed448: pkcs8 API changes RustCrypto/signatures#851

Merged

baloo added a commit to baloo/RSA that referenced this pull request Aug 19, 2024

pkcs8 API changes

40113d8

see RustCrypto/formats#1483

baloo mentioned this pull request Aug 19, 2024

pkcs8 API changes RustCrypto/RSA#446

Merged

baloo added a commit to baloo/traits that referenced this pull request Aug 19, 2024

elliptic-curve: pkcs8 API changes

df6f7ab

see RustCrypto/formats#1483

baloo mentioned this pull request Aug 19, 2024

elliptic-curve: pkcs8 API changes RustCrypto/traits#1650

Merged

baloo force-pushed the baloo/pkcs8/owned-ref-private-key branch from 5e9b14d to bcf2035 Compare August 19, 2024 17:32

baloo commented Aug 19, 2024

View reviewed changes

baloo added 9 commits August 19, 2024 22:36

pkcs8: use OctetString/BitString

2a95a85

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: PrivateKeyInfo -> PrivateKeyInfoRef

8ab1b6a

Signed-off-by: Arthur Gautier <[email protected]>

pkcs1: adopt pkcs8 API changes

b977b56

sec1: adopt pkcs8 API changes

9d8dd7d

cms: loosen pkcs5 dependency

56a0fbd

Signed-off-by: Arthur Gautier <[email protected]>

use git dependencies for CI

d0a7984

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: EncryptedPrivateKeyInfo use OctetString

a1448d6

Signed-off-by: Arthur Gautier <[email protected]>

pkcs8: only pem brings alloc

b9a1d15

Signed-off-by: Arthur Gautier <[email protected]>

pkcs12: move to EncryptedPrivateKeyInfoRef

3400a03

Signed-off-by: Arthur Gautier <[email protected]>

baloo force-pushed the baloo/pkcs8/owned-ref-private-key branch from fb4becf to 3400a03 Compare August 19, 2024 22:36

baloo requested a review from tarcieri August 20, 2024 16:21

tarcieri approved these changes Sep 4, 2024

View reviewed changes

tarcieri merged commit 6877a3e into RustCrypto:master Sep 4, 2024
165 checks passed

baloo deleted the baloo/pkcs8/owned-ref-private-key branch September 4, 2024 23:47

baloo added a commit to baloo/traits that referenced this pull request Sep 5, 2024

elliptic-curve: pkcs8 API changes

97cd12a

see RustCrypto/formats#1483

baloo added a commit to baloo/signatures that referenced this pull request Sep 5, 2024

ecdsa: pkcs8 API changes

9d56d4b

see RustCrypto/formats#1483

baloo added a commit to baloo/traits that referenced this pull request Sep 5, 2024

elliptic-curve: pkcs8 API changes

ccad5d2

see RustCrypto/formats#1483

baloo added a commit to baloo/traits that referenced this pull request Sep 5, 2024

elliptic-curve: pkcs8 API changes

8ea45a0

see RustCrypto/formats#1483

baloo added a commit to baloo/traits that referenced this pull request Sep 5, 2024

elliptic-curve: pkcs8 API changes

1b036fe

see RustCrypto/formats#1483

baloo added a commit to baloo/signatures that referenced this pull request Sep 5, 2024

ecdsa: pkcs8 API changes

c813a76

see RustCrypto/formats#1483

tarcieri pushed a commit to RustCrypto/traits that referenced this pull request Sep 5, 2024

elliptic-curve: pkcs8 API changes (#1650)

6427769

see RustCrypto/formats#1483

baloo added a commit to baloo/RSA that referenced this pull request Sep 5, 2024

pkcs8 API changes

948ea96

see RustCrypto/formats#1483

tarcieri pushed a commit to RustCrypto/RSA that referenced this pull request Sep 5, 2024

pkcs8 API changes (#446)

aeedb5a

see RustCrypto/formats#1483

baloo mentioned this pull request Sep 6, 2024

cut pkcs1 pkcs8 and sec1 pre-releases #1504

Merged

baloo added a commit that referenced this pull request Sep 6, 2024

cut pkcs1 pkcs8 and sec1 pre-releases (#1504)

48f6fa5

- pkcs1 `0.8.0-rc.1` - pkcs8 `0.11.0-rc.1` - sec1 `0.8.0-rc.1` This comes after the merge of API breaks on pkcs8 ([#1483]) [#1483]: #1483

baloo mentioned this pull request Sep 6, 2024

bump pkcs8 dependency after breaking change RustCrypto/signatures#857

Merged

baloo mentioned this pull request Sep 7, 2024

fix pkcs8 api break RustCrypto/elliptic-curves#1075

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned #1483

pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned #1483

baloo commented Aug 18, 2024 •

edited

Loading

baloo Aug 18, 2024

tarcieri Aug 19, 2024

baloo Aug 19, 2024

baloo commented Aug 19, 2024

baloo Aug 19, 2024 •

edited

Loading

tarcieri Sep 4, 2024

tarcieri left a comment

pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned #1483

pkcs8: provide PrivateKeyInfoRef/PrivateKeyInfoOwned #1483

Conversation

baloo commented Aug 18, 2024 • edited Loading

baloo Aug 18, 2024

Choose a reason for hiding this comment

tarcieri Aug 19, 2024

Choose a reason for hiding this comment

baloo Aug 19, 2024

Choose a reason for hiding this comment

baloo commented Aug 19, 2024

baloo Aug 19, 2024 • edited Loading

Choose a reason for hiding this comment

tarcieri Sep 4, 2024

Choose a reason for hiding this comment

tarcieri left a comment

Choose a reason for hiding this comment

baloo commented Aug 18, 2024 •

edited

Loading

baloo Aug 19, 2024 •

edited

Loading