Constify DH-related code.

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

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index ebfbcb43471c45a3b1407c80fa92012303dc8a8c..fcb8142348be4e1a0ca35906b75b74bee31f635e 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -60,24 +60,40 @@
 #include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
+#include <openssl/engine.h>
 
 const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 
-static DH_METHOD *default_DH_method;
+static const DH_METHOD *default_DH_method;
 static int dh_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
 
-void DH_set_default_method(DH_METHOD *meth)
+void DH_set_default_openssl_method(const DH_METHOD *meth)
 {
-       default_DH_method = meth;
+       ENGINE *e;
+       /* We'll need to notify the "openssl" ENGINE of this
+        * change too. We won't bother locking things down at
+        * our end as there was never any locking in these
+        * functions! */
+       if(default_DH_method != meth)
+               {
+               default_DH_method = meth;
+               e = ENGINE_by_id("openssl");
+               if(e)
+                       {
+                       ENGINE_set_DH(e, meth);
+                       ENGINE_free(e);
+                       }
+               }
 }
 
-DH_METHOD *DH_get_default_method(void)
+const DH_METHOD *DH_get_default_openssl_method(void)
 {
        if(!default_DH_method) default_DH_method = DH_OpenSSL();
        return default_DH_method;
 }
 
+#if 0
 DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth)
 {
         DH_METHOD *mtmp;
@@ -87,25 +103,56 @@ DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth)
         if (meth->init) meth->init(dh);
         return mtmp;
 }
+#else
+int DH_set_method(DH *dh, ENGINE *engine)
+{
+       ENGINE *mtmp;
+       const DH_METHOD *meth;
+       mtmp = dh->engine;
+       meth = ENGINE_get_DH(mtmp);
+       if (!ENGINE_init(engine))
+               return 0;
+       if (meth->finish) meth->finish(dh);
+       dh->engine= engine;
+       meth = ENGINE_get_DH(engine);
+       if (meth->init) meth->init(dh);
+       /* SHOULD ERROR CHECK THIS!!! */
+       ENGINE_finish(mtmp);
+       return 1;
+}
+#endif
 
 DH *DH_new(void)
 {
        return DH_new_method(NULL);
 }
 
+#if 0
 DH *DH_new_method(DH_METHOD *meth)
+#else
+DH *DH_new_method(ENGINE *engine)
+#endif
        {
+       const DH_METHOD *meth;
        DH *ret;
-       ret=(DH *)Malloc(sizeof(DH));
+       ret=(DH *)OPENSSL_malloc(sizeof(DH));
 
        if (ret == NULL)
                {
                DHerr(DH_F_DH_NEW,ERR_R_MALLOC_FAILURE);
                return(NULL);
                }
-       if(!default_DH_method) default_DH_method = DH_OpenSSL();
-       if(meth) ret->meth = meth;
-       else ret->meth = default_DH_method;
+       if(engine)
+               ret->engine = engine;
+       else
+               {
+               if((ret->engine=ENGINE_get_default_DH()) == NULL)
+                       {
+                       OPENSSL_free(ret);
+                       return NULL;
+                       }
+               }
+       meth = ENGINE_get_DH(ret->engine);
        ret->pad=0;
        ret->version=0;
        ret->p=NULL;
@@ -113,12 +160,17 @@ DH *DH_new_method(DH_METHOD *meth)
        ret->length=0;
        ret->pub_key=NULL;
        ret->priv_key=NULL;
+       ret->q=NULL;
+       ret->j=NULL;
+       ret->seed = NULL;
+       ret->seedlen = 0;
+       ret->counter = NULL;
        ret->method_mont_p=NULL;
        ret->references = 1;
-       ret->flags=ret->meth->flags;
-       if ((ret->meth->init != NULL) && !ret->meth->init(ret))
+       ret->flags=meth->flags;
+       if ((meth->init != NULL) && !meth->init(ret))
                {
-               Free(ret);
+               OPENSSL_free(ret);
                ret=NULL;
                }
        else
@@ -128,6 +180,7 @@ DH *DH_new_method(DH_METHOD *meth)
 
 void DH_free(DH *r)
        {
+       const DH_METHOD *meth;
        int i;
        if(r == NULL) return;
        i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
@@ -145,13 +198,19 @@ void DH_free(DH *r)
 
        CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
 
-       if(r->meth->finish) r->meth->finish(r);
+       meth = ENGINE_get_DH(r->engine);
+       if(meth->finish) meth->finish(r);
+       ENGINE_finish(r->engine);
 
        if (r->p != NULL) BN_clear_free(r->p);
        if (r->g != NULL) BN_clear_free(r->g);
+       if (r->q != NULL) BN_clear_free(r->q);
+       if (r->j != NULL) BN_clear_free(r->j);
+       if (r->seed) OPENSSL_free(r->seed);
+       if (r->counter != NULL) BN_clear_free(r->counter);
        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-       Free(r);
+       OPENSSL_free(r);
        }
 
 int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
@@ -172,7 +231,7 @@ void *DH_get_ex_data(DH *d, int idx)
        return(CRYPTO_get_ex_data(&d->ex_data,idx));
        }
 
-int DH_size(DH *dh)
+int DH_size(const DH *dh)
        {
        return(BN_num_bytes(dh->p));
        }