Skip to content

Commit f527a8f

Browse files
author
Cruz Monrreal
authored
Merge pull request #9755 from netanelgonen/fix_support
support in more types then just RSA_KEYPAIR
2 parents 62aae6a + 1a87f24 commit f527a8f

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/psa_crypto_spm.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,18 +1125,13 @@ psa_status_t psa_generate_key(psa_key_handle_t key_handle,
11251125
in_vec[1].base = &bits;
11261126
in_vec[1].len = sizeof(size_t);
11271127

1128-
/* currently the parameter argument is used only for RSA keypair
1129-
and ignored in other cases. support for other algorithms
1130-
may be added later*/
1131-
if (PSA_KEY_TYPE_RSA_KEYPAIR == type) {
1132-
in_vec[2].base = parameters;
1133-
/* size of parameter is unsigned integer as defined in header */
1134-
in_vec[2].len = parameters_size;
1135-
} else { // currenty ignored for non RSA case
1136-
in_vec[2].base = NULL;
1137-
in_vec[2].len = 0;
1128+
if (((parameters == NULL) && (parameters_size != 0)) || ((parameters != NULL) && (parameters_size == 0))) {
1129+
return (PSA_ERROR_INVALID_ARGUMENT);
11381130
}
11391131

1132+
in_vec[2].base = parameters;
1133+
in_vec[2].len = parameters_size;
1134+
11401135
handle = psa_connect(PSA_KEY_MNG_ID, MINOR_VER);
11411136
if (handle <= 0) {
11421137
return (PSA_ERROR_COMMUNICATION_FAILURE);

0 commit comments

Comments
 (0)