TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove LTC_{DH,DSA}_KEY_INITIALIZER

Browse Source
This commit is contained in:
Steffen Jaeckel
2017-07-04 10:25:38 +02:00
parent d1ecd82a42
commit dbeaefd65b
10 changed files with 7 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/headers/tomcrypt_pk.h
-4
View File
@@ -213,8 +213,6 @@ typedef struct {
void *prime;
} dh_key;
#define LTC_DH_KEY_INITIALIZER { PK_PUBLIC, NULL, NULL, NULL, NULL }
int dh_get_groupsize(dh_key *key);
int dh_export(unsigned char *out, unsigned long *outlen, int type, dh_key *key);
@@ -442,8 +440,6 @@ typedef struct {
void *y;
} dsa_key;
#define LTC_DSA_KEY_INITIALIZER { PK_PUBLIC, 0, NULL, NULL, NULL, NULL, NULL }
int dsa_make_key(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
int dsa_set_pqg(const unsigned char *p, unsigned long plen,
src/pk/dh/dh_check_pubkey.c
-3
View File
@@ -23,9 +23,6 @@ int dh_check_pubkey(dh_key *key)
int i, digit_count, bits_set = 0, err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->y != NULL);
LTC_ARGCHK(key->base != NULL);
LTC_ARGCHK(key->prime != NULL);
if ((err = mp_init(&p_minus1)) != CRYPT_OK) {
return err;
src/pk/dh/dh_make_key.c
-4
View File
@@ -49,10 +49,6 @@ int dh_make_key(prng_state *prng, int wprng, dh_key *key)
int err, max_iterations = PK_MAX_RETRIES;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x != NULL);
LTC_ARGCHK(key->y != NULL);
LTC_ARGCHK(key->base != NULL);
LTC_ARGCHK(key->prime != NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
LTC_ARGCHK(prng != NULL);
src/pk/dh/dh_set.c
-16
View File
@@ -28,10 +28,6 @@ int dh_set_pg(const unsigned char *p, unsigned long plen,
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->base == NULL);
LTC_ARGCHK(key->prime == NULL);
LTC_ARGCHK(p != NULL);
LTC_ARGCHK(g != NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
@@ -65,10 +61,6 @@ int dh_set_pg_dhparam(const unsigned char *dhparam, unsigned long dhparamlen, dh
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->base == NULL);
LTC_ARGCHK(key->prime == NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
LTC_ARGCHK(dhparam != NULL);
LTC_ARGCHK(dhparamlen > 0);
@@ -102,10 +94,6 @@ int dh_set_pg_groupsize(int groupsize, dh_key *key)
int err, i;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->base == NULL);
LTC_ARGCHK(key->prime == NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
LTC_ARGCHK(groupsize > 0);
@@ -142,10 +130,6 @@ int dh_set_key(const unsigned char *pub, unsigned long publen,
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x != NULL);
LTC_ARGCHK(key->y != NULL);
LTC_ARGCHK(key->base != NULL);
LTC_ARGCHK(key->prime != NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
if(priv == NULL) {
src/pk/dsa/dsa_generate_pqg.c
-6
View File
@@ -216,12 +216,6 @@ int dsa_generate_pqg(prng_state *prng, int wprng, int group_size, int modulus_si
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->p == NULL);
LTC_ARGCHK(key->g == NULL);
LTC_ARGCHK(key->q == NULL);
LTC_ARGCHK(key->qord == 0);
LTC_ARGCHK(ltc_mp.name != NULL);
/* init mp_ints */
src/pk/dsa/dsa_make_key.c
-5
View File
@@ -27,11 +27,6 @@ int dsa_make_key_ex(prng_state *prng, int wprng, dsa_key *key)
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x != NULL);
LTC_ARGCHK(key->y != NULL);
LTC_ARGCHK(key->p != NULL);
LTC_ARGCHK(key->g != NULL);
LTC_ARGCHK(key->q != NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
/* so now we have our DH structure, generator g, order q, modulus p
src/pk/dsa/dsa_set.c
-17
View File
@@ -33,12 +33,6 @@ int dsa_set_pqg(const unsigned char *p, unsigned long plen,
LTC_ARGCHK(q != NULL);
LTC_ARGCHK(g != NULL);
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->p == NULL);
LTC_ARGCHK(key->g == NULL);
LTC_ARGCHK(key->q == NULL);
LTC_ARGCHK(key->qord == 0);
LTC_ARGCHK(ltc_mp.name != NULL);
/* init key */
@@ -80,12 +74,6 @@ int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamle
LTC_ARGCHK(dsaparam != NULL);
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x == NULL);
LTC_ARGCHK(key->y == NULL);
LTC_ARGCHK(key->p == NULL);
LTC_ARGCHK(key->g == NULL);
LTC_ARGCHK(key->q == NULL);
LTC_ARGCHK(key->qord == 0);
LTC_ARGCHK(ltc_mp.name != NULL);
/* init key */
@@ -130,11 +118,6 @@ int dsa_set_key(const unsigned char *pub, unsigned long publen,
int err;
LTC_ARGCHK(key != NULL);
LTC_ARGCHK(key->x != NULL);
LTC_ARGCHK(key->y != NULL);
LTC_ARGCHK(key->p != NULL);
LTC_ARGCHK(key->g != NULL);
LTC_ARGCHK(key->q != NULL);
LTC_ARGCHK(ltc_mp.name != NULL);
if ((err = mp_read_unsigned_bin(key->y, (unsigned char *)pub , publen)) != CRYPT_OK) { goto LBL_ERR; }