33use crate :: { Error , Result } ;
44use core:: fmt;
55use der:: {
6- asn1:: OctetStringRef , Decode , DecodeValue , Encode , EncodeValue , Header , Length , Reader ,
7- Sequence , Writer ,
6+ asn1:: OctetStringRef , Decode , DecodeValue , Encode , EncodeValue , FixedTag , Header , Length ,
7+ Reader , Sequence , Writer ,
88} ;
99use pkcs5:: EncryptionScheme ;
1010
1111#[ cfg( feature = "alloc" ) ]
12- use der:: SecretDocument ;
12+ use der:: { asn1 :: OctetString , SecretDocument } ;
1313
1414#[ cfg( feature = "encryption" ) ]
1515use { pkcs5:: pbes2, rand_core:: CryptoRngCore } ;
@@ -37,23 +37,27 @@ use der::pem::PemLabel;
3737///
3838/// [RFC 5208 Section 6]: https://tools.ietf.org/html/rfc5208#section-6
3939#[ derive( Clone , Eq , PartialEq ) ]
40- pub struct EncryptedPrivateKeyInfo < ' a > {
40+ pub struct EncryptedPrivateKeyInfo < Data > {
4141 /// Algorithm identifier describing a password-based symmetric encryption
4242/// scheme used to encrypt the `encrypted_data` field.
4343pub encryption_algorithm : EncryptionScheme ,
4444
4545 /// Private key data
46- pub encrypted_data : & ' a [ u8 ] ,
46+ pub encrypted_data : Data ,
4747}
4848
49- impl < ' a > EncryptedPrivateKeyInfo < ' a > {
49+ impl < ' a , Data > EncryptedPrivateKeyInfo < Data >
50+ where
51+ Data : DecodeValue < ' a , Error = der:: Error > + EncodeValue + FixedTag + ' a ,
52+ Data : AsRef < [ u8 ] > ,
53+ {
5054 /// Attempt to decrypt this encrypted private key using the provided
5155/// password to derive an encryption key.
5256#[ cfg( feature = "encryption" ) ]
5357 pub fn decrypt ( & self , password : impl AsRef < [ u8 ] > ) -> Result < SecretDocument > {
5458 Ok ( self
5559 . encryption_algorithm
56- . decrypt ( password, self . encrypted_data ) ?
60+ . decrypt ( password, self . encrypted_data . as_ref ( ) ) ?
5761 . try_into ( ) ?)
5862 }
5963
@@ -66,7 +70,7 @@ impl<'a> EncryptedPrivateKeyInfo<'a> {
6670 doc : & [ u8 ] ,
6771 ) -> Result < SecretDocument > {
6872 let pbes2_params = pbes2:: Parameters :: recommended ( rng) ;
69- EncryptedPrivateKeyInfo :: encrypt_with ( pbes2_params, password, doc)
73+ EncryptedPrivateKeyInfoOwned :: encrypt_with ( pbes2_params, password, doc)
7074 }
7175
7276 /// Encrypt this private key using a symmetric encryption key derived
@@ -78,55 +82,64 @@ impl<'a> EncryptedPrivateKeyInfo<'a> {
7882 doc : & [ u8 ] ,
7983 ) -> Result < SecretDocument > {
8084 let encrypted_data = pbes2_params. encrypt ( password, doc) ?;
85+ let encrypted_data = OctetStringRef :: new ( & encrypted_data) ?;
8186
8287 EncryptedPrivateKeyInfo {
8388 encryption_algorithm : pbes2_params. into ( ) ,
84- encrypted_data : & encrypted_data ,
89+ encrypted_data,
8590 }
8691 . try_into ( )
8792 }
8893}
8994
90- impl < ' a > DecodeValue < ' a > for EncryptedPrivateKeyInfo < ' a > {
95+ impl < ' a , Data > DecodeValue < ' a > for EncryptedPrivateKeyInfo < Data >
96+ where
97+ Data : DecodeValue < ' a , Error = der:: Error > + FixedTag + ' a ,
98+ {
9199 type Error = der:: Error ;
92100
93- fn decode_value < R : Reader < ' a > > (
94- reader : & mut R ,
95- header : Header ,
96- ) -> der:: Result < EncryptedPrivateKeyInfo < ' a > > {
101+ fn decode_value < R : Reader < ' a > > ( reader : & mut R , header : Header ) -> der:: Result < Self > {
97102 reader. read_nested ( header. length , |reader| {
98103 Ok ( Self {
99104 encryption_algorithm : reader. decode ( ) ?,
100- encrypted_data : OctetStringRef :: decode ( reader) ? . as_bytes ( ) ,
105+ encrypted_data : reader. decode ( ) ? ,
101106 } )
102107 } )
103108 }
104109}
105110
106- impl EncodeValue for EncryptedPrivateKeyInfo < ' _ > {
111+ impl < Data > EncodeValue for EncryptedPrivateKeyInfo < Data >
112+ where
113+ Data : EncodeValue + FixedTag ,
114+ {
107115 fn value_len ( & self ) -> der:: Result < Length > {
108- self . encryption_algorithm . encoded_len ( ) ?
109- + OctetStringRef :: new ( self . encrypted_data ) ?. encoded_len ( ) ?
116+ self . encryption_algorithm . encoded_len ( ) ? + self . encrypted_data . encoded_len ( ) ?
110117 }
111118
112119 fn encode_value ( & self , writer : & mut impl Writer ) -> der:: Result < ( ) > {
113120 self . encryption_algorithm . encode ( writer) ?;
114- OctetStringRef :: new ( self . encrypted_data ) ? . encode ( writer) ?;
121+ self . encrypted_data . encode ( writer) ?;
115122 Ok ( ( ) )
116123 }
117124}
118125
119- impl < ' a > Sequence < ' a > for EncryptedPrivateKeyInfo < ' a > { }
126+ impl < ' a , Data > Sequence < ' a > for EncryptedPrivateKeyInfo < Data > where
127+ Data : DecodeValue < ' a , Error = der:: Error > + EncodeValue + FixedTag + ' a
128+ {
129+ }
120130
121- impl < ' a > TryFrom < & ' a [ u8 ] > for EncryptedPrivateKeyInfo < ' a > {
131+ impl < ' a , Data > TryFrom < & ' a [ u8 ] > for EncryptedPrivateKeyInfo < Data >
132+ where
133+ Data : DecodeValue < ' a , Error = der:: Error > + EncodeValue + FixedTag + ' a ,
134+ {
122135 type Error = Error ;
123136
124137 fn try_from ( bytes : & ' a [ u8 ] ) -> Result < Self > {
125138 Ok ( Self :: from_der ( bytes) ?)
126139 }
127140}
128141
129- impl < ' a > fmt:: Debug for EncryptedPrivateKeyInfo < ' a > {
142+ impl < Data > fmt:: Debug for EncryptedPrivateKeyInfo < Data > {
130143 fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
131144 f. debug_struct ( "EncryptedPrivateKeyInfo" )
132145 . field ( "encryption_algorithm" , & self . encryption_algorithm )
@@ -135,24 +148,37 @@ impl<'a> fmt::Debug for EncryptedPrivateKeyInfo<'a> {
135148}
136149
137150#[ cfg( feature = "alloc" ) ]
138- impl TryFrom < EncryptedPrivateKeyInfo < ' _ > > for SecretDocument {
151+ impl < ' a , Data > TryFrom < EncryptedPrivateKeyInfo < Data > > for SecretDocument
152+ where
153+ Data : DecodeValue < ' a , Error = der:: Error > + EncodeValue + FixedTag + ' a ,
154+ {
139155 type Error = Error ;
140156
141- fn try_from ( encrypted_private_key : EncryptedPrivateKeyInfo < ' _ > ) -> Result < SecretDocument > {
157+ fn try_from ( encrypted_private_key : EncryptedPrivateKeyInfo < Data > ) -> Result < SecretDocument > {
142158 SecretDocument :: try_from ( & encrypted_private_key)
143159 }
144160}
145161
146162#[ cfg( feature = "alloc" ) ]
147- impl TryFrom < & EncryptedPrivateKeyInfo < ' _ > > for SecretDocument {
163+ impl < ' a , Data > TryFrom < & EncryptedPrivateKeyInfo < Data > > for SecretDocument
164+ where
165+ Data : DecodeValue < ' a , Error = der:: Error > + EncodeValue + FixedTag + ' a ,
166+ {
148167 type Error = Error ;
149168
150- fn try_from ( encrypted_private_key : & EncryptedPrivateKeyInfo < ' _ > ) -> Result < SecretDocument > {
169+ fn try_from ( encrypted_private_key : & EncryptedPrivateKeyInfo < Data > ) -> Result < SecretDocument > {
151170 Ok ( Self :: encode_msg ( encrypted_private_key) ?)
152171 }
153172}
154173
155174#[ cfg( feature = "pem" ) ]
156- impl PemLabel for EncryptedPrivateKeyInfo < ' _ > {
175+ impl < Data > PemLabel for EncryptedPrivateKeyInfo < Data > {
157176 const PEM_LABEL : & ' static str = "ENCRYPTED PRIVATE KEY" ;
158177}
178+
179+ /// [`EncryptedPrivateKeyInfo`] with [`OctetStringRef`] encrypted data.
180+ pub type EncryptedPrivateKeyInfoRef < ' a > = EncryptedPrivateKeyInfo < OctetStringRef < ' a > > ;
181+
182+ #[ cfg( feature = "alloc" ) ]
183+ /// [`EncryptedPrivateKeyInfo`] with [`OctetString`] encrypted data.
184+ pub type EncryptedPrivateKeyInfoOwned = EncryptedPrivateKeyInfo < OctetString > ;
0 commit comments