File tree 2 files changed +13
-14
lines changed
2 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -257,12 +257,11 @@ impl<'a> KbkdfParams<'a> {
257
257
prf_data_params : & ' a [ PrfDataParam < ' a > ] ,
258
258
additional_derived_keys : Option < & ' a mut [ DerivedKey ] > ,
259
259
) -> Self {
260
- let mut additional_derived_keys = additional_derived_keys
261
- . map ( |keys| {
262
- keys. iter_mut ( )
263
- . map ( Into :: into)
264
- . collect :: < Box < [ CK_DERIVED_KEY ] > > ( )
265
- } ) ;
260
+ let mut additional_derived_keys = additional_derived_keys. map ( |keys| {
261
+ keys. iter_mut ( )
262
+ . map ( Into :: into)
263
+ . collect :: < Box < [ CK_DERIVED_KEY ] > > ( )
264
+ } ) ;
266
265
267
266
let inner = CK_SP800_108_KDF_PARAMS {
268
267
prfType : prf_mechanism. into ( ) ,
@@ -329,12 +328,11 @@ impl<'a> KbkdfFeedbackParams<'a> {
329
328
iv : Option < & ' a [ u8 ] > ,
330
329
additional_derived_keys : Option < & ' a mut [ DerivedKey ] > ,
331
330
) -> Self {
332
- let mut additional_derived_keys = additional_derived_keys
333
- . map ( |keys| {
334
- keys. iter_mut ( )
335
- . map ( Into :: into)
336
- . collect :: < Box < [ CK_DERIVED_KEY ] > > ( )
337
- } ) ;
331
+ let mut additional_derived_keys = additional_derived_keys. map ( |keys| {
332
+ keys. iter_mut ( )
333
+ . map ( Into :: into)
334
+ . collect :: < Box < [ CK_DERIVED_KEY ] > > ( )
335
+ } ) ;
338
336
339
337
let inner = CK_SP800_108_FEEDBACK_KDF_PARAMS {
340
338
prfType : prf_mechanism. into ( ) ,
Original file line number Diff line number Diff line change @@ -1252,7 +1252,8 @@ impl From<&Mechanism<'_>> for CK_MECHANISM {
1252
1252
fn make_mechanism < T > ( mechanism : CK_MECHANISM_TYPE , param : & T ) -> CK_MECHANISM {
1253
1253
CK_MECHANISM {
1254
1254
mechanism,
1255
- /* SAFETY: Parameters that expect to have some part of themselves
1255
+ /*
1256
+ * SAFETY: Parameters that expect to have some part of themselves
1256
1257
* mutated should indicate this to the end user by marking both the
1257
1258
* relevant constructor parameters and the type's PhantomData as mut.
1258
1259
* Otherwise, we should generally not expect the backend to mutate the
@@ -1262,7 +1263,7 @@ fn make_mechanism<T>(mechanism: CK_MECHANISM_TYPE, param: &T) -> CK_MECHANISM {
1262
1263
* - aead::GcmMessageParams
1263
1264
* - kbkdf::KbkdfParams
1264
1265
* - kbkdf::KbkdfFeedbackParams
1265
- * */
1266
+ */
1266
1267
pParameter : param as * const T as * mut c_void ,
1267
1268
ulParameterLen : size_of :: < T > ( )
1268
1269
. try_into ( )
You can’t perform that action at this time.
0 commit comments