Reformat/tidy some of the ASN1 code.

[openssl.git] / crypto / dh / dh_key.c

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 718a9a481e7e8d4c1bab3e1127ad6dd052af15e4..48e7be45c5cb7a08f500dae90ca9ca86a278a91c 100644 (file)
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -61,7 +61,6 @@
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/dh.h>
-#include <openssl/engine.h>
 
 static int generate_key(DH *dh);
 static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
@@ -74,12 +73,12 @@ static int dh_finish(DH *dh);
 
 int DH_generate_key(DH *dh)
        {
-       return ENGINE_get_DH(dh->engine)->generate_key(dh);
+       return dh->meth->generate_key(dh);
        }
 
 int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
        {
-       return ENGINE_get_DH(dh->engine)->compute_key(key, pub_key, dh);
+       return dh->meth->compute_key(key, pub_key, dh);
        }
 
 static DH_METHOD dh_ossl = {
@@ -90,6 +89,7 @@ dh_bn_mod_exp,
 dh_init,
 dh_finish,
 0,
+NULL,
 NULL
 };
 
@@ -101,6 +101,7 @@ const DH_METHOD *DH_OpenSSL(void)
 static int generate_key(DH *dh)
        {
        int ok=0;
+       int generate_new_key=0;
        unsigned l;
        BN_CTX *ctx;
        BN_MONT_CTX *mont;
@@ -113,6 +114,7 @@ static int generate_key(DH *dh)
                {
                priv_key=BN_new();
                if (priv_key == NULL) goto err;
+               generate_new_key=1;
                }
        else
                priv_key=dh->priv_key;
@@ -133,15 +135,13 @@ static int generate_key(DH *dh)
                }
        mont=(BN_MONT_CTX *)dh->method_mont_p;
 
-       l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */
-
-       do
+       if (generate_new_key)
                {
+               l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */
                if (!BN_rand(priv_key, l, 0, 0)) goto err;
-               if (!ENGINE_get_DH(dh->engine)->bn_mod_exp(dh, pub_key, dh->g,
-                       priv_key,dh->p,ctx,mont)) goto err;
                }
-       while (BN_is_one(priv_key));
+       if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, priv_key,dh->p,ctx,mont))
+               goto err;
                
        dh->pub_key=pub_key;
        dh->priv_key=priv_key;
@@ -181,8 +181,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
                }
 
        mont=(BN_MONT_CTX *)dh->method_mont_p;
-       if (!ENGINE_get_DH(dh->engine)->bn_mod_exp(dh, tmp, pub_key,
-                               dh->priv_key,dh->p,ctx,mont))
+       if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont))
                {
                DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);
                goto err;