Skip to content

Commit 21d100d

Browse files
karel-msjaeckel
authored andcommitted
RSA: make rsa_decode_parameters work with rsa_key instead of ltc_rsa_parameters
1 parent 80de9b0 commit 21d100d

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/headers/tomcrypt_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ int rsa_make_key_bn_e(prng_state *prng, int wprng, int size, void *e,
497497
int rsa_import_pkcs1(const unsigned char *in, unsigned long inlen, rsa_key *key);
498498
int rsa_import_pkcs8_asn1(ltc_asn1_list *alg_id, ltc_asn1_list *priv_key, rsa_key *key);
499499
int rsa_import_spki(const unsigned char *in, unsigned long inlen, rsa_key *key);
500-
int rsa_decode_parameters(const ltc_asn1_list *parameters, ltc_rsa_parameters *rsa_params);
500+
int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key);
501501
#endif /* LTC_MRSA */
502502

503503
/* ---- DH Routines ---- */

src/pk/rsa/rsa_import_x509.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static int s_rsa_decode_parameters(const rsa_pss_parameters_data *d, ltc_rsa_par
127127
return CRYPT_OK;
128128
}
129129

130-
int rsa_decode_parameters(const ltc_asn1_list *parameters, ltc_rsa_parameters *rsa_params)
130+
int rsa_decode_parameters(const ltc_asn1_list *parameters, rsa_key *key)
131131
{
132132
int err;
133133
rsa_pss_parameters_data d;
@@ -138,7 +138,11 @@ int rsa_decode_parameters(const ltc_asn1_list *parameters, ltc_rsa_parameters *r
138138
return err;
139139
}
140140

141-
return s_rsa_decode_parameters(&d, rsa_params);
141+
if ((err = s_rsa_decode_parameters(&d, &key->params)) != CRYPT_OK) {
142+
return err;
143+
}
144+
key->pss_oaep = 1;
145+
return CRYPT_OK;
142146
}
143147

144148
static LTC_INLINE int s_rsa_1_5_import_spki(const unsigned char *in, unsigned long inlen, rsa_key *key)

0 commit comments

Comments
 (0)