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

beautify dh & rsa

Browse Source
This commit is contained in:
Steffen Jaeckel 2017-07-21 10:16:19 +02:00
parent 6b925485a8
commit 129bc7175f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pk/dh/dh_free.c
View File

@ -18,7 +18,7 @@
void dh_free(dh_key *key) void dh_free(dh_key *key)
{ {
LTC_ARGCHKVD(key != NULL); LTC_ARGCHKVD(key != NULL);
mp_cleanup_multi(&key->base, &key->prime, &key->x, &key->y, NULL); mp_cleanup_multi(&key->prime, &key->base, &key->y, &key->x, NULL);
} }
#endif /* LTC_MDH */ #endif /* LTC_MDH */

2
src/pk/dh/dh_generate_key.c
View File

@ -91,7 +91,7 @@ freebuf:
zeromem(buf, keysize); zeromem(buf, keysize);
XFREE(buf); XFREE(buf);
freemp: freemp:
if (err != CRYPT_OK) mp_clear_multi(key->x, key->y, key->base, key->prime, NULL); if (err != CRYPT_OK) dh_free(key);
return err; return err;
} }

4
src/pk/dh/dh_import.c
View File

@ -28,7 +28,7 @@ int dh_import(const unsigned char *in, unsigned long inlen, dh_key *key)
LTC_ARGCHK(key != NULL); LTC_ARGCHK(key != NULL);
/* init */ /* init */
if ((err = mp_init_multi(&key->prime, &key->base, &key->x, &key->y, NULL)) != CRYPT_OK) { if ((err = mp_init_multi(&key->x, &key->y, &key->base, &key->prime, NULL)) != CRYPT_OK) {
return err; return err;
} }
@ -86,7 +86,7 @@ int dh_import(const unsigned char *in, unsigned long inlen, dh_key *key)
return CRYPT_OK; return CRYPT_OK;
error: error:
mp_clear_multi(key->prime, key->base, key->y, key->x, NULL); dh_free(key);
return err; return err;
} }

4
src/pk/rsa/rsa_import_pkcs8.c
View File

@ -131,14 +131,14 @@ int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
LTC_ASN1_INTEGER, 1UL, key->qP, LTC_ASN1_INTEGER, 1UL, key->qP,
LTC_ASN1_EOL, 0UL, NULL); LTC_ASN1_EOL, 0UL, NULL);
if (err != CRYPT_OK) { goto LBL_ERR; } if (err != CRYPT_OK) { goto LBL_ERR; }
mp_clear_multi(zero, iter, NULL);
key->type = PK_PRIVATE; key->type = PK_PRIVATE;
err = CRYPT_OK; err = CRYPT_OK;
goto LBL_FREE2; goto LBL_FREE2;
LBL_ERR: LBL_ERR:
mp_clear_multi(key->d, key->e, key->N, key->dQ, key->dP, key->qP, key->p, key->q, zero, iter, NULL); rsa_free(key);
LBL_FREE2: LBL_FREE2:
mp_clear_multi(iter, zero, NULL);
XFREE(buf2); XFREE(buf2);
LBL_FREE1: LBL_FREE1:
XFREE(buf1); XFREE(buf1);