oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Try harder to generate a good keypair.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18642 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-20 06:37:33 +00:00
parent bb4c84c9e1
commit 4c4e6c6307
1 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lib/des/dh-imath.c
View File

@@ -81,47 +81,76 @@ mpz2BN(mpz_t *s)
* *
*/ */
#definen DH_NUM_TRIES 10
static int static int
dh_generate_key(DH *dh) dh_generate_key(DH *dh)
{ {
mpz_t pub, priv_key, g, p; mpz_t pub, priv_key, g, p;
int have_private_key = (dh->priv_key != NULL);
int times = 0;
if (dh->p == NULL || dh->g == NULL) if (dh->p == NULL || dh->g == NULL)
return 0; return 0;
if (dh->priv_key == NULL) { while (times++ < DH_NUM_TRIES) {
size_t bits = BN_num_bits(dh->p); if (!have_private_key) {
dh->priv_key = BN_new(); size_t bits = BN_num_bits(dh->p);
if (dh->priv_key == NULL)
return 0; if (dh->priv_key)
if (!BN_rand(dh->priv_key, bits - 1, 0, 0)) { BN_free(dh->priv_key);
BN_clear_free(dh->priv_key);
dh->priv_key = NULL; dh->priv_key = BN_new();
return 0; if (dh->priv_key == NULL)
return 0;
if (!BN_rand(dh->priv_key, bits - 1, 0, 0)) {
BN_clear_free(dh->priv_key);
dh->priv_key = NULL;
return 0;
}
} }
if (dh->pub_key)
BN_free(dh->pub_key);
mp_int_init(&pub);
mp_int_init(&priv_key);
mp_int_init(&g);
mp_int_init(&p);
BN2mpz(&priv_key, dh->priv_key);
BN2mpz(&g, dh->g);
BN2mpz(&p, dh->p);
res = mp_int_exptmod(&g, &priv_key, &p, &pub);
mp_int_clear(&priv_key);
mp_int_clear(&g);
mp_int_clear(&p);
if (res != MP_OK)
continue;
dh->pub_key = mpz2BN(&pub);
mp_int_clear(&pub);
if (dh->pub_key == NULL)
return 0;
if (DH_check_pubkey(dh, peer_pub_key, &codes) && codes == 0)
break;
if (have_private_key)
reurn 0;
} }
if (dh->pub_key)
BN_free(dh->pub_key);
mp_int_init(&pub); if (i > DH_NUM_TRIES) {
mp_int_init(&priv_key); if (!have_private_key && dh->priv_key) {
mp_int_init(&g); BN_free(dh->priv_key);
mp_int_init(&p); dh->priv_key = NULL;
}
BN2mpz(&priv_key, dh->priv_key); if (dh->pub_key) {
BN2mpz(&g, dh->g); BN_free(dh->pub_key);
BN2mpz(&p, dh->p); dh->pub_key = NULL;
}
mp_int_exptmod(&g, &priv_key, &p, &pub);
mp_int_clear(&priv_key);
mp_int_clear(&g);
mp_int_clear(&p);
dh->pub_key = mpz2BN(&pub);
mp_int_clear(&pub);
if (dh->pub_key == NULL)
return 0; return 0;
}
return 1; return 1;
} }