Skip to content

Commit e20e204

Browse files
karel-mkarel-m
committed
dh_set_key + dsa_set_key API change described in #248 
1 parent fa4713b commit e20e204

5 files changed

Lines changed: 23 additions & 38 deletions

File tree

‎src/headers/tomcrypt_pk.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ int dh_set_pg(const unsigned char *p, unsigned long plen,
224224
int dh_set_pg_dhparam(const unsigned char *dhparam, unsigned long dhparamlen, dh_key *key);
225225
int dh_set_pg_groupsize(int groupsize, dh_key *key);
226226

227-
int dh_set_key(const unsigned char *pub, unsigned long publen,
228-
const unsigned char *priv, unsigned long privlen,
229-
dh_key *key);
227+
int dh_set_key(const unsigned char *in, unsigned long inlen, int type, dh_key *key);
230228
int dh_generate_key(prng_state *prng, int wprng, dh_key *key);
231229

232230
int dh_shared_secret(dh_key *private_key, dh_key *public_key,
@@ -449,9 +447,7 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,
449447
int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamlen, dsa_key *key);
450448
int dsa_generate_pqg(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
451449

452-
int dsa_set_key(const unsigned char *pub, unsigned long publen,
453-
const unsigned char *priv, unsigned long privlen,
454-
dsa_key *key);
450+
int dsa_set_key(const unsigned char *in, unsigned long inlen, int type, dsa_key *key);
455451
int dsa_generate_key(prng_state *prng, int wprng, dsa_key *key);
456452

457453
void dsa_free(dsa_key *key);

‎src/pk/dh/dh_set.c‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,21 @@ int dh_set_pg_groupsize(int groupsize, dh_key *key)
8787
@param key [out] the destination for the imported key
8888
@return CRYPT_OK if successful
8989
*/
90-
int dh_set_key(const unsigned char *pub, unsigned long publen,
91-
const unsigned char *priv, unsigned long privlen,
92-
dh_key *key)
90+
int dh_set_key(const unsigned char *in, unsigned long inlen, int type, dh_key *key)
9391
{
9492
int err;
9593

9694
LTC_ARGCHK(key != NULL);
9795
LTC_ARGCHK(ltc_mp.name != NULL);
9896

99-
if(priv == NULL) {
100-
if ((err = mp_read_unsigned_bin(key->y, (unsigned char*)pub, publen)) != CRYPT_OK) { goto LBL_ERR; }
101-
key->type = PK_PUBLIC;
102-
mp_clear(key->x);
103-
key->x = NULL;
97+
if (type == PK_PRIVATE) {
98+
key->type = PK_PRIVATE;
99+
if ((err = mp_read_unsigned_bin(key->x, (unsigned char*)in, inlen)) != CRYPT_OK) { goto LBL_ERR; }
100+
if ((err = mp_exptmod(key->base, key->x, key->prime, key->y)) != CRYPT_OK) { goto LBL_ERR; }
104101
}
105102
else {
106-
if ((err = mp_read_unsigned_bin(key->x, (unsigned char*)priv, privlen)) != CRYPT_OK) { goto LBL_ERR; }
107-
if (pub != NULL) {
108-
if ((err = mp_read_unsigned_bin(key->y, (unsigned char*)pub, publen)) != CRYPT_OK) { goto LBL_ERR; }
109-
}
110-
else {
111-
/* compute y value */
112-
if ((err = mp_exptmod(key->base, key->x, key->prime, key->y)) != CRYPT_OK) { goto LBL_ERR; }
113-
}
114-
key->type = PK_PRIVATE;
103+
key->type = PK_PUBLIC;
104+
if ((err = mp_read_unsigned_bin(key->y, (unsigned char*)in, inlen)) != CRYPT_OK) { goto LBL_ERR; }
115105
}
116106

117107
/* check public key */

‎src/pk/dsa/dsa_set.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,
6666
@param key [out] the destination for the imported key
6767
@return CRYPT_OK if successful.
6868
*/
69-
int dsa_set_key(const unsigned char *pub, unsigned long publen,
70-
const unsigned char *priv, unsigned long privlen,
71-
dsa_key *key)
69+
int dsa_set_key(const unsigned char *in, unsigned long inlen, int type, dsa_key *key)
7270
{
7371
int err;
7472

@@ -80,13 +78,14 @@ int dsa_set_key(const unsigned char *pub, unsigned long publen,
8078
LTC_ARGCHK(key->q != NULL);
8179
LTC_ARGCHK(ltc_mp.name != NULL);
8280

83-
if ((err = mp_read_unsigned_bin(key->y, (unsigned char *)pub , publen)) != CRYPT_OK) { goto LBL_ERR; }
84-
if (priv != NULL) {
81+
if (type == PK_PRIVATE) {
8582
key->type = PK_PRIVATE;
86-
if ((err = mp_read_unsigned_bin(key->x, (unsigned char *)priv , privlen)) != CRYPT_OK) { goto LBL_ERR; }
83+
if ((err = mp_read_unsigned_bin(key->x, (unsigned char *)in, inlen)) != CRYPT_OK) { goto LBL_ERR; }
84+
if ((err = mp_exptmod(key->g, key->x, key->p, key->y)) != CRYPT_OK) { goto LBL_ERR; }
8785
}
8886
else {
8987
key->type = PK_PUBLIC;
88+
if ((err = mp_read_unsigned_bin(key->y, (unsigned char *)in, inlen)) != CRYPT_OK) { goto LBL_ERR; }
9089
}
9190

9291
return CRYPT_OK;

‎tests/dh_test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static int _set_test(void)
268268

269269
for (i = 0; i < 1; i++) {
270270
DO(dh_set_pg(test[i].p, test[i].plen, test[i].g, test[i].glen, &k1));
271-
DO(dh_set_key(NULL, 0, test[i].x, test[i].xlen, &k1));
271+
DO(dh_set_key(test[i].x, test[i].xlen, PK_PRIVATE, &k1));
272272

273273
len = sizeof(buf);
274274
DO(dh_export(buf, &len, PK_PRIVATE, &k1));
@@ -301,7 +301,7 @@ static int _set_test(void)
301301
dh_free(&k1);
302302

303303
DO(dh_set_pg(test[i].p, test[i].plen, test[i].g, test[i].glen, &k1));
304-
DO(dh_set_key(test[i].y, test[i].ylen, test[i].x, test[i].xlen, &k1));
304+
DO(dh_set_key(test[i].x, test[i].xlen, PK_PRIVATE, &k1));
305305

306306
len = sizeof(buf);
307307
DO(dh_export(buf, &len, PK_PRIVATE, &k1));
@@ -320,7 +320,7 @@ static int _set_test(void)
320320
dh_free(&k1);
321321

322322
DO(dh_set_pg(test[i].p, test[i].plen, test[i].g, test[i].glen, &k2));
323-
DO(dh_set_key(test[i].y, test[i].ylen, NULL, 0, &k2));
323+
DO(dh_set_key(test[i].y, test[i].ylen, PK_PUBLIC, &k2));
324324

325325
len = sizeof(buf);
326326
DO(dh_export(buf, &len, PK_PUBLIC, &k2));

‎tests/dsa_test.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ static int _dsa_compat_test(void)
179179
key_parts[1], key_lens[1],
180180
key_parts[2], key_lens[2],
181181
&key));
182-
DO(dsa_set_key(key_parts[3], key_lens[3],
183-
key_parts[4], key_lens[4],
182+
DO(dsa_set_key(key_parts[4], key_lens[4],
183+
PK_PRIVATE,
184184
&key));
185185
len = sizeof(buf);
186186
DO(dsa_export(buf, &len, PK_PRIVATE | PK_STD, &key));
@@ -196,7 +196,7 @@ static int _dsa_compat_test(void)
196196
key_parts[2], key_lens[2],
197197
&key));
198198
DO(dsa_set_key(key_parts[3], key_lens[3],
199-
NULL, 0,
199+
PK_PUBLIC,
200200
&key));
201201
len = sizeof(buf);
202202
DO(dsa_export(buf, &len, PK_PUBLIC | PK_STD, &key));
@@ -220,7 +220,7 @@ static int _dsa_compat_test(void)
220220
/* try import dsaparam - our public key */
221221
DO(dsa_set_pqg_dsaparam(dsaparam_der, sizeof(dsaparam_der), &key));
222222
DO(dsa_set_key(key_parts[3], key_lens[3],
223-
NULL, 0,
223+
PK_PUBLIC,
224224
&key));
225225
len = sizeof(buf);
226226
DO(dsa_export(buf, &len, PK_PUBLIC | PK_STD, &key));
@@ -232,8 +232,8 @@ static int _dsa_compat_test(void)
232232

233233
/* try import dsaparam - our private key */
234234
DO(dsa_set_pqg_dsaparam(dsaparam_der, sizeof(dsaparam_der), &key));
235-
DO(dsa_set_key(key_parts[3], key_lens[3],
236-
key_parts[4], key_lens[4],
235+
DO(dsa_set_key(key_parts[4], key_lens[4],
236+
PK_PRIVATE,
237237
&key));
238238
len = sizeof(buf);
239239
DO(dsa_export(buf, &len, PK_PRIVATE | PK_STD, &key));

0 commit comments

Comments
 (0)