beautify dh & rsa

Author: sjaeckel

src/pk/dh/dh_free.c

@@ -18,7 +18,7 @@
 void dh_free(dh_key *key)
 {
    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 */

src/pk/dh/dh_generate_key.c

@@ -91,7 +91,7 @@ int dh_generate_key(prng_state *prng, int wprng, dh_key *key)
    zeromem(buf, keysize);
    XFREE(buf);
 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;
 }
 

src/pk/dh/dh_import.c

@@ -28,7 +28,7 @@ int dh_import(const unsigned char *in, unsigned long inlen, dh_key *key)
    LTC_ARGCHK(key != NULL);
 
    /* 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;
    }
 
@@ -86,7 +86,7 @@ int dh_import(const unsigned char *in, unsigned long inlen, dh_key *key)
    return CRYPT_OK;
 
 error:
-   mp_clear_multi(key->prime, key->base, key->y, key->x, NULL);
+   dh_free(key);
    return err;
 }
 

src/pk/rsa/rsa_import_pkcs8.c

@@ -131,14 +131,14 @@ int rsa_import_pkcs8(const unsigned char *in, unsigned long inlen,
                                    LTC_ASN1_INTEGER, 1UL, key->qP,
                                    LTC_ASN1_EOL,     0UL, NULL);
    if (err != CRYPT_OK) { goto LBL_ERR; }
-   mp_clear_multi(zero, iter, NULL);
    key->type = PK_PRIVATE;
    err = CRYPT_OK;
    goto LBL_FREE2;
 
 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:
+   mp_clear_multi(iter, zero, NULL);
    XFREE(buf2);
 LBL_FREE1:
    XFREE(buf1);