Skip to content

Commit dbeaefd

Browse files
sjaeckelsjaeckel
committed
remove LTC_{DH,DSA}_KEY_INITIALIZER
1 parent d1ecd82 commit dbeaefd

10 files changed

Lines changed: 7 additions & 66 deletions

File tree

‎demos/timing.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ static void time_prng(void)
646646
/* time various DSA operations */
647647
static void time_dsa(void)
648648
{
649-
dsa_key key = LTC_DSA_KEY_INITIALIZER;
649+
dsa_key key;
650650
ulong64 t1, t2;
651651
unsigned long x, y;
652652
int err;
@@ -893,7 +893,7 @@ static void time_katja(void) { fprintf(stderr, "NO Katja\n"); }
893893
/* time various DH operations */
894894
static void time_dh(void)
895895
{
896-
dh_key key = LTC_DH_KEY_INITIALIZER;
896+
dh_key key;
897897
ulong64 t1, t2;
898898
unsigned long i, x, y;
899899
int err;

‎src/headers/tomcrypt_pk.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ typedef struct {
213213
void *prime;
214214
} dh_key;
215215

216-
#define LTC_DH_KEY_INITIALIZER { PK_PUBLIC, NULL, NULL, NULL, NULL }
217-
218216
int dh_get_groupsize(dh_key *key);
219217

220218
int dh_export(unsigned char *out, unsigned long *outlen, int type, dh_key *key);
@@ -442,8 +440,6 @@ typedef struct {
442440
void *y;
443441
} dsa_key;
444442

445-
#define LTC_DSA_KEY_INITIALIZER { PK_PUBLIC, 0, NULL, NULL, NULL, NULL, NULL }
446-
447443
int dsa_make_key(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
448444

449445
int dsa_set_pqg(const unsigned char *p, unsigned long plen,

‎src/pk/dh/dh_check_pubkey.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ int dh_check_pubkey(dh_key *key)
2323
int i, digit_count, bits_set = 0, err;
2424

2525
LTC_ARGCHK(key != NULL);
26-
LTC_ARGCHK(key->y != NULL);
27-
LTC_ARGCHK(key->base != NULL);
28-
LTC_ARGCHK(key->prime != NULL);
2926

3027
if ((err = mp_init(&p_minus1)) != CRYPT_OK) {
3128
return err;

‎src/pk/dh/dh_make_key.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ int dh_make_key(prng_state *prng, int wprng, dh_key *key)
4949
int err, max_iterations = PK_MAX_RETRIES;
5050

5151
LTC_ARGCHK(key != NULL);
52-
LTC_ARGCHK(key->x != NULL);
53-
LTC_ARGCHK(key->y != NULL);
54-
LTC_ARGCHK(key->base != NULL);
55-
LTC_ARGCHK(key->prime != NULL);
5652
LTC_ARGCHK(ltc_mp.name != NULL);
5753
LTC_ARGCHK(prng != NULL);
5854

‎src/pk/dh/dh_set.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ int dh_set_pg(const unsigned char *p, unsigned long plen,
2828
int err;
2929

3030
LTC_ARGCHK(key != NULL);
31-
LTC_ARGCHK(key->x == NULL);
32-
LTC_ARGCHK(key->y == NULL);
33-
LTC_ARGCHK(key->base == NULL);
34-
LTC_ARGCHK(key->prime == NULL);
3531
LTC_ARGCHK(p != NULL);
3632
LTC_ARGCHK(g != NULL);
3733
LTC_ARGCHK(ltc_mp.name != NULL);
@@ -65,10 +61,6 @@ int dh_set_pg_dhparam(const unsigned char *dhparam, unsigned long dhparamlen, dh
6561
int err;
6662

6763
LTC_ARGCHK(key != NULL);
68-
LTC_ARGCHK(key->x == NULL);
69-
LTC_ARGCHK(key->y == NULL);
70-
LTC_ARGCHK(key->base == NULL);
71-
LTC_ARGCHK(key->prime == NULL);
7264
LTC_ARGCHK(ltc_mp.name != NULL);
7365
LTC_ARGCHK(dhparam != NULL);
7466
LTC_ARGCHK(dhparamlen > 0);
@@ -102,10 +94,6 @@ int dh_set_pg_groupsize(int groupsize, dh_key *key)
10294
int err, i;
10395

10496
LTC_ARGCHK(key != NULL);
105-
LTC_ARGCHK(key->x == NULL);
106-
LTC_ARGCHK(key->y == NULL);
107-
LTC_ARGCHK(key->base == NULL);
108-
LTC_ARGCHK(key->prime == NULL);
10997
LTC_ARGCHK(ltc_mp.name != NULL);
11098
LTC_ARGCHK(groupsize > 0);
11199

@@ -142,10 +130,6 @@ int dh_set_key(const unsigned char *pub, unsigned long publen,
142130
int err;
143131

144132
LTC_ARGCHK(key != NULL);
145-
LTC_ARGCHK(key->x != NULL);
146-
LTC_ARGCHK(key->y != NULL);
147-
LTC_ARGCHK(key->base != NULL);
148-
LTC_ARGCHK(key->prime != NULL);
149133
LTC_ARGCHK(ltc_mp.name != NULL);
150134

151135
if(priv == NULL) {

‎src/pk/dsa/dsa_generate_pqg.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,6 @@ int dsa_generate_pqg(prng_state *prng, int wprng, int group_size, int modulus_si
216216
int err;
217217

218218
LTC_ARGCHK(key != NULL);
219-
LTC_ARGCHK(key->x == NULL);
220-
LTC_ARGCHK(key->y == NULL);
221-
LTC_ARGCHK(key->p == NULL);
222-
LTC_ARGCHK(key->g == NULL);
223-
LTC_ARGCHK(key->q == NULL);
224-
LTC_ARGCHK(key->qord == 0);
225219
LTC_ARGCHK(ltc_mp.name != NULL);
226220

227221
/* init mp_ints */

‎src/pk/dsa/dsa_make_key.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ int dsa_make_key_ex(prng_state *prng, int wprng, dsa_key *key)
2727
int err;
2828

2929
LTC_ARGCHK(key != NULL);
30-
LTC_ARGCHK(key->x != NULL);
31-
LTC_ARGCHK(key->y != NULL);
32-
LTC_ARGCHK(key->p != NULL);
33-
LTC_ARGCHK(key->g != NULL);
34-
LTC_ARGCHK(key->q != NULL);
3530
LTC_ARGCHK(ltc_mp.name != NULL);
3631

3732
/* so now we have our DH structure, generator g, order q, modulus p

‎src/pk/dsa/dsa_set.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,
3333
LTC_ARGCHK(q != NULL);
3434
LTC_ARGCHK(g != NULL);
3535
LTC_ARGCHK(key != NULL);
36-
LTC_ARGCHK(key->x == NULL);
37-
LTC_ARGCHK(key->y == NULL);
38-
LTC_ARGCHK(key->p == NULL);
39-
LTC_ARGCHK(key->g == NULL);
40-
LTC_ARGCHK(key->q == NULL);
41-
LTC_ARGCHK(key->qord == 0);
4236
LTC_ARGCHK(ltc_mp.name != NULL);
4337

4438
/* init key */
@@ -80,12 +74,6 @@ int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamle
8074

8175
LTC_ARGCHK(dsaparam != NULL);
8276
LTC_ARGCHK(key != NULL);
83-
LTC_ARGCHK(key->x == NULL);
84-
LTC_ARGCHK(key->y == NULL);
85-
LTC_ARGCHK(key->p == NULL);
86-
LTC_ARGCHK(key->g == NULL);
87-
LTC_ARGCHK(key->q == NULL);
88-
LTC_ARGCHK(key->qord == 0);
8977
LTC_ARGCHK(ltc_mp.name != NULL);
9078

9179
/* init key */
@@ -130,11 +118,6 @@ int dsa_set_key(const unsigned char *pub, unsigned long publen,
130118
int err;
131119

132120
LTC_ARGCHK(key != NULL);
133-
LTC_ARGCHK(key->x != NULL);
134-
LTC_ARGCHK(key->y != NULL);
135-
LTC_ARGCHK(key->p != NULL);
136-
LTC_ARGCHK(key->g != NULL);
137-
LTC_ARGCHK(key->q != NULL);
138121
LTC_ARGCHK(ltc_mp.name != NULL);
139122

140123
if ((err = mp_read_unsigned_bin(key->y, (unsigned char *)pub , publen)) != CRYPT_OK) { goto LBL_ERR; }

‎tests/dh_test.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static int _prime_test(void)
6060

6161
static int _dhparam_test(void)
6262
{
63-
dh_key k = LTC_DH_KEY_INITIALIZER;
63+
dh_key k;
6464
unsigned char buf[1024];
6565
/* generated by: openssl dhparam -outform der -out dhparam.der 2048 */
6666
unsigned char dhparam_der[] = {
@@ -150,9 +150,7 @@ static int _dhparam_test(void)
150150

151151
static int _set_test(void)
152152
{
153-
dh_key k1 = LTC_DH_KEY_INITIALIZER;
154-
dh_key k2 = LTC_DH_KEY_INITIALIZER;
155-
dh_key k3 = LTC_DH_KEY_INITIALIZER;
153+
dh_key k1, k2, k3;
156154
unsigned char buf[4096];
157155
unsigned long len;
158156
int i;
@@ -368,8 +366,7 @@ static int _basic_test(void)
368366
unsigned char buf[3][4096];
369367
unsigned long x, y, z;
370368
int size;
371-
dh_key usera = LTC_DH_KEY_INITIALIZER;
372-
dh_key userb = LTC_DH_KEY_INITIALIZER;
369+
dh_key usera, userb;
373370

374371
/* make up two keys */
375372
DO(dh_set_pg_groupsize(KEYSIZE/8, &usera));

‎tests/dsa_test.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static unsigned char dsaparam_der[] = {
131131

132132
static int _dsa_compat_test(void)
133133
{
134-
dsa_key key = LTC_DSA_KEY_INITIALIZER;
134+
dsa_key key;
135135
unsigned char tmp[1024], buf[1024];
136136
unsigned long x, len;
137137
unsigned char key_parts[5][256];
@@ -251,8 +251,7 @@ int dsa_test(void)
251251
unsigned char msg[16], out[1024], out2[1024], ch;
252252
unsigned long x, y;
253253
int stat1, stat2;
254-
dsa_key key = LTC_DSA_KEY_INITIALIZER;
255-
dsa_key key2 = LTC_DSA_KEY_INITIALIZER;
254+
dsa_key key, key2;
256255

257256
DO(_dsa_compat_test());
258257

0 commit comments

Comments
 (0)