Skip to content

Commit eddea9f

Browse files
tgonzalezorlandoarmtgonzalezorlandoarm
committed
signature: Rename functions with RSA mark
Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
1 parent a61af21 commit eddea9f

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎parsec-openssl-provider/src/keymgmt/mod.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ pub unsafe extern "C" fn parsec_provider_ecdsa_kmgmt_import(
487487
/*
488488
should import data indicated by selection into keydata with values taken from the OSSL_PARAM array params
489489
*/
490-
pub unsafe extern "C" fn parsec_provider_kmgmt_import(
490+
pub unsafe extern "C" fn parsec_provider_kmgmt_rsa_import(
491491
keydata: VOID_PTR,
492492
selection: std::os::raw::c_int,
493493
params: *mut OSSL_PARAM,
@@ -556,7 +556,7 @@ pub unsafe extern "C" fn parsec_provider_kmgmt_import(
556556
should return an array of descriptor OSSL_PARAM for data indicated by selection, for parameters that
557557
OSSL_FUNC_keymgmt_import() can handle
558558
*/
559-
pub unsafe extern "C" fn parsec_provider_kmgmt_import_types(
559+
pub unsafe extern "C" fn parsec_provider_kmgmt_rsa_import_types(
560560
selection: std::os::raw::c_int,
561561
) -> *const OSSL_PARAM {
562562
if selection & OSSL_KEYMGMT_SELECT_ALL_PARAMETERS as std::os::raw::c_int != 0 {
@@ -721,7 +721,7 @@ pub unsafe extern "C" fn parsec_provider_keymgmt_dup(
721721
}
722722
}
723723

724-
pub unsafe extern "C" fn parsec_provider_kmgmt_query_operation_name(
724+
pub unsafe extern "C" fn parsec_provider_kmgmt_rsa_query_operation_name(
725725
_operation_id: std::os::raw::c_int,
726726
) -> *const std::os::raw::c_char {
727727
PARSEC_PROVIDER_RSA_NAME.as_ptr() as *const std::os::raw::c_char
@@ -733,8 +733,8 @@ pub unsafe extern "C" fn parsec_provider_ecdsa_kmgmt_query_operation_name(
733733
return PARSEC_PROVIDER_ECDSA_NAME.as_ptr() as *const std::os::raw::c_char;
734734
}
735735

736-
const OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME_PTR: KeyMgmtQueryOperationNamePtr =
737-
parsec_provider_kmgmt_query_operation_name;
736+
const OSSL_FUNC_KEYMGMT_RSA_QUERY_OPERATION_NAME_PTR: KeyMgmtQueryOperationNamePtr =
737+
parsec_provider_kmgmt_rsa_query_operation_name;
738738
const OSSL_FUNC_KEYMGMT_ECDSA_QUERY_OPERATION_NAME_PTR: KeyMgmtQueryOperationNamePtr =
739739
parsec_provider_ecdsa_kmgmt_query_operation_name;
740740
pub type KeyMgmtQueryOperationNamePtr =
@@ -761,10 +761,10 @@ const OSSL_FUNC_KEYMGMT_NEW_PTR: KeyMgmtNewPtr = parsec_provider_kmgmt_new;
761761
const OSSL_FUNC_KEYMGMT_FREE_PTR: KeyMgmtFreePtr = parsec_provider_kmgmt_free;
762762
const OSSL_FUNC_KEYMGMT_HAS_PTR: KeyMgmtHasPtr = parsec_provider_kmgmt_has;
763763
const OSSL_FUNC_KEYMGMT_ECDSA_HAS_PTR: KeyMgmtHasPtr = parsec_provider_ecdsa_kmgmt_has;
764-
const OSSL_FUNC_KEYMGMT_IMPORT_PTR: KeyMgmtImportPtr = parsec_provider_kmgmt_import;
764+
const OSSL_FUNC_KEYMGMT_RSA_IMPORT_PTR: KeyMgmtImportPtr = parsec_provider_kmgmt_rsa_import;
765765
const OSSL_FUNC_KEYMGMT_ECDSA_IMPORT_PTR: KeyMgmtImportPtr = parsec_provider_ecdsa_kmgmt_import;
766-
const OSSL_FUNC_KEYMGMT_IMPORT_TYPES_PTR: KeyMgmtImportTypesPtr =
767-
parsec_provider_kmgmt_import_types;
766+
const OSSL_FUNC_KEYMGMT_RSA_IMPORT_TYPES_PTR: KeyMgmtImportTypesPtr =
767+
parsec_provider_kmgmt_rsa_import_types;
768768
const OSSL_FUNC_KEYMGMT_ECDSA_IMPORT_TYPES_PTR: KeyMgmtImportTypesPtr =
769769
parsec_provider_ecdsa_kmgmt_import_types;
770770
const OSSL_FUNC_KEYMGMT_SET_PARAMS_PTR: KeyMgmtSetParamsPtr = parsec_provider_kmgmt_set_params;
@@ -779,22 +779,22 @@ const OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS_PTR: KeyMgmtGettableParamsPtr =
779779
const OSSL_FUNC_KEYMGMT_MATCH_PTR: KeyMgmtMatchPtr = parsec_provider_kmgmt_match;
780780
const OSSL_FUNC_KEYMGMT_ECDSA_MATCH_PTR: KeyMgmtMatchPtr = parsec_provider_ecdsa_kmgmt_match;
781781

782-
const PARSEC_PROVIDER_KEYMGMT_IMPL: [OSSL_DISPATCH; 13] = [
782+
const PARSEC_PROVIDER_KEYMGMT_RSA_IMPL: [OSSL_DISPATCH; 13] = [
783783
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_DUP, OSSL_FUNC_KEYMGMT_DUP_PTR) },
784784
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_NEW, OSSL_FUNC_KEYMGMT_NEW_PTR) },
785785
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_FREE, OSSL_FUNC_KEYMGMT_FREE_PTR) },
786786
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_HAS, OSSL_FUNC_KEYMGMT_HAS_PTR) },
787-
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_IMPORT, OSSL_FUNC_KEYMGMT_IMPORT_PTR) },
787+
unsafe { ossl_dispatch!(OSSL_FUNC_KEYMGMT_IMPORT, OSSL_FUNC_KEYMGMT_RSA_IMPORT_PTR) },
788788
unsafe {
789789
ossl_dispatch!(
790790
OSSL_FUNC_KEYMGMT_IMPORT_TYPES,
791-
OSSL_FUNC_KEYMGMT_IMPORT_TYPES_PTR
791+
OSSL_FUNC_KEYMGMT_RSA_IMPORT_TYPES_PTR
792792
)
793793
},
794794
unsafe {
795795
ossl_dispatch!(
796796
OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
797-
OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME_PTR
797+
OSSL_FUNC_KEYMGMT_RSA_QUERY_OPERATION_NAME_PTR
798798
)
799799
},
800800
unsafe {
@@ -880,7 +880,7 @@ pub const PARSEC_PROVIDER_KEYMGMT: [OSSL_ALGORITHM; 3] = [
880880
ossl_algorithm!(
881881
PARSEC_PROVIDER_RSA_NAME,
882882
PARSEC_PROVIDER_DFLT_PROPERTIES,
883-
PARSEC_PROVIDER_KEYMGMT_IMPL,
883+
PARSEC_PROVIDER_KEYMGMT_RSA_IMPL,
884884
PARSEC_PROVIDER_DESCRIPTION_RSA
885885
),
886886
ossl_algorithm!(),
@@ -1023,7 +1023,7 @@ fn test_kmgmt_import() {
10231023
ossl_param!(),
10241024
];
10251025
let bad_import_res = unsafe {
1026-
parsec_provider_kmgmt_import(
1026+
parsec_provider_kmgmt_rsa_import(
10271027
keyctx,
10281028
OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS as i32,
10291029
&mut bad_params as _,
@@ -1039,7 +1039,7 @@ fn test_kmgmt_import() {
10391039
];
10401040

10411041
let good_import_res = unsafe {
1042-
parsec_provider_kmgmt_import(
1042+
parsec_provider_kmgmt_rsa_import(
10431043
keyctx,
10441044
OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS as i32,
10451045
&mut good_params as _,

‎parsec-openssl-provider/src/signature/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ unsafe extern "C" fn parsec_provider_signature_digest_sign_init(
230230
.key_attributes(key_name)
231231
.map_err(|e| format!("Failed to get specified key's attributes: {}", e))?;
232232
match key_attributes.key_type {
233-
Type::RsaKeyPair => Ok(parsec_provider_signature_set_params(ctx, params)),
233+
Type::RsaKeyPair => Ok(parsec_provider_signature_rsa_set_params(ctx, params)),
234234
Type::EccKeyPair {
235235
curve_family: EccFamily::SecpR1,
236236
} => Ok(parsec_provider_signature_ecdsa_set_params(ctx, params)),
@@ -244,7 +244,7 @@ unsafe extern "C" fn parsec_provider_signature_digest_sign_init(
244244
}
245245
}
246246

247-
unsafe extern "C" fn parsec_provider_signature_settable_params(
247+
unsafe extern "C" fn parsec_provider_signature_rsa_settable_params(
248248
_ctx: VOID_PTR,
249249
_provkey: VOID_PTR,
250250
) -> *const OSSL_PARAM {
@@ -287,7 +287,7 @@ pub unsafe extern "C" fn parsec_provider_signature_ecdsa_set_params(
287287
/*
288288
Sets the context parameters for RSA signature
289289
*/
290-
pub unsafe extern "C" fn parsec_provider_signature_set_params(
290+
pub unsafe extern "C" fn parsec_provider_signature_rsa_set_params(
291291
_keydata: VOID_PTR,
292292
params: *const OSSL_PARAM,
293293
) -> std::os::raw::c_int {
@@ -359,12 +359,12 @@ pub type SignatureDigestSignInitPtr = unsafe extern "C" fn(
359359
*const OSSL_PARAM,
360360
) -> std::os::raw::c_int;
361361

362-
const OSSL_FUNC_SIGNATURE_SETTABLE_PARAMS_PTR: SignatureSettableParamsPtr =
363-
parsec_provider_signature_settable_params;
362+
const OSSL_FUNC_SIGNATURE_RSA_SETTABLE_PARAMS_PTR: SignatureSettableParamsPtr =
363+
parsec_provider_signature_rsa_settable_params;
364364
const OSSL_FUNC_SIGNATURE_ECDSA_SETTABLE_PARAMS_PTR: SignatureSettableParamsPtr =
365365
parsec_provider_signature_ecdsa_settable_params;
366-
const OSSL_FUNC_SIGNATURE_SET_PARAMS_PTR: SignatureSetParamsPtr =
367-
parsec_provider_signature_set_params;
366+
const OSSL_FUNC_SIGNATURE_RSA_SET_PARAMS_PTR: SignatureSetParamsPtr =
367+
parsec_provider_signature_rsa_set_params;
368368
const OSSL_FUNC_SIGNATURE_ECDSA_SET_PARAMS_PTR: SignatureSetParamsPtr =
369369
parsec_provider_signature_ecdsa_set_params;
370370
pub type SignatureSettableParamsPtr = unsafe extern "C" fn(VOID_PTR, VOID_PTR) -> *const OSSL_PARAM;
@@ -380,7 +380,7 @@ const OSSL_FUNC_SIGNATURE_DIGEST_SIGN_PTR: SignatureDigestSignPtr =
380380
const OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT_PTR: SignatureDigestSignInitPtr =
381381
parsec_provider_signature_digest_sign_init;
382382

383-
const PARSEC_PROVIDER_SIGN_IMPL: [OSSL_DISPATCH; 7] = [
383+
const PARSEC_PROVIDER_RSA_SIGN_IMPL: [OSSL_DISPATCH; 7] = [
384384
unsafe { ossl_dispatch!(OSSL_FUNC_SIGNATURE_NEWCTX, OSSL_FUNC_SIGNATURE_NEWCTX_PTR) },
385385
unsafe { ossl_dispatch!(OSSL_FUNC_SIGNATURE_FREECTX, OSSL_FUNC_SIGNATURE_FREECTX_PTR) },
386386
unsafe {
@@ -398,13 +398,13 @@ const PARSEC_PROVIDER_SIGN_IMPL: [OSSL_DISPATCH; 7] = [
398398
unsafe {
399399
ossl_dispatch!(
400400
OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
401-
OSSL_FUNC_SIGNATURE_SETTABLE_PARAMS_PTR
401+
OSSL_FUNC_SIGNATURE_RSA_SETTABLE_PARAMS_PTR
402402
)
403403
},
404404
unsafe {
405405
ossl_dispatch!(
406406
OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,
407-
OSSL_FUNC_SIGNATURE_SET_PARAMS_PTR
407+
OSSL_FUNC_SIGNATURE_RSA_SET_PARAMS_PTR
408408
)
409409
},
410410
ossl_dispatch!(),
@@ -450,7 +450,7 @@ pub const PARSEC_PROVIDER_SIGNATURE: [OSSL_ALGORITHM; 3] = [
450450
ossl_algorithm!(
451451
PARSEC_PROVIDER_RSA_NAME,
452452
PARSEC_PROVIDER_DFLT_PROPERTIES,
453-
PARSEC_PROVIDER_SIGN_IMPL,
453+
PARSEC_PROVIDER_RSA_SIGN_IMPL,
454454
PARSEC_PROVIDER_DESCRIPTION_RSA
455455
),
456456
ossl_algorithm!(),

0 commit comments

Comments
 (0)