1 files changed, 22 insertions, 12 deletions

diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 0c7eeaf260..6915d79dcc 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -61,6 +61,7 @@
 #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, BIGNUM *pub_key, DH *dh);
@@ -72,12 +73,12 @@ static int dh_finish(DH *dh);
 
 int DH_generate_key(DH *dh)
         {
-        return dh->meth->generate_key(dh);
+        return ENGINE_get_DH(dh->engine)->generate_key(dh);
         }
 
 int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
         {
-        return dh->meth->compute_key(key, pub_key, dh);
+        return ENGINE_get_DH(dh->engine)->compute_key(key, pub_key, dh);
         }
 
 static DH_METHOD dh_ossl = {
@@ -137,8 +138,9 @@ static int generate_key(DH *dh)
                 }
         mont=(BN_MONT_CTX *)dh->method_mont_p;
 
-        if (!dh->meth->bn_mod_exp(dh, pub_key,dh->g,priv_key,dh->p,&ctx,mont))
-                                                                goto err;
+        if (!ENGINE_get_DH(dh->engine)->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;
@@ -177,7 +179,8 @@ static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
                 }
 
         mont=(BN_MONT_CTX *)dh->method_mont_p;
-        if (!dh->meth->bn_mod_exp(dh, tmp,pub_key,dh->priv_key,dh->p,&ctx,mont))
+        if (!ENGINE_get_DH(dh->engine)->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;
@@ -193,19 +196,26 @@ err:
 static int dh_bn_mod_exp(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
                         const BIGNUM *m, BN_CTX *ctx,
                         BN_MONT_CTX *m_ctx)
-{
-        return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
-}
+        {
+        if (a->top == 1)
+                {
+                BN_ULONG A = a->d[0];
+                return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx);
+                }
+        else
+                return BN_mod_exp_mont(r,a,p,m,ctx,m_ctx);
+        }
+
 
 static int dh_init(DH *dh)
-{
+        {
         dh->flags |= DH_FLAG_CACHE_MONT_P;
         return(1);
-}
+        }
 
 static int dh_finish(DH *dh)
-{
+        {
         if(dh->method_mont_p)
                 BN_MONT_CTX_free((BN_MONT_CTX *)dh->method_mont_p);
         return(1);
-}
+        }