Do to DH and DSA what has already been done to RSA. This involves moving

[openssl.git] / crypto / dsa / dsa_lib.c

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 9c106b2b165fd850b6f76de5833c9f08d9deae7d..60027116613437583bbbac27bf14ad2de3217f53 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -63,19 +63,34 @@
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/asn1.h>
+#include <openssl/engine.h>
 
 const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 
-static DSA_METHOD *default_DSA_method;
+static const DSA_METHOD *default_DSA_method;
 static int dsa_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dsa_meth = NULL;
 
-void DSA_set_default_method(DSA_METHOD *meth)
+void DSA_set_default_openssl_method(const DSA_METHOD *meth)
 {
-       default_DSA_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_DSA_method != meth)
+               {
+               default_DSA_method = meth;
+               e = ENGINE_by_id("openssl");
+               if(e)
+                       {
+                       ENGINE_set_DSA(e, meth);
+                       ENGINE_free(e);
+                       }
+               }
 }
 
-DSA_METHOD *DSA_get_default_method(void)
+const DSA_METHOD *DSA_get_default_openssl_method(void)
 {
        if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();
        return default_DSA_method;
@@ -86,6 +101,7 @@ DSA *DSA_new(void)
        return DSA_new_method(NULL);
 }
 
+#if 0
 DSA_METHOD *DSA_set_method(DSA *dsa, DSA_METHOD *meth)
 {
         DSA_METHOD *mtmp;
@@ -95,20 +111,52 @@ DSA_METHOD *DSA_set_method(DSA *dsa, DSA_METHOD *meth)
         if (meth->init) meth->init(dsa);
         return mtmp;
 }
+#else
+int DSA_set_method(DSA *dsa, ENGINE *engine)
+       {
+       ENGINE *mtmp;
+       const DSA_METHOD *meth;
+       mtmp = dsa->engine;
+       meth = ENGINE_get_DSA(mtmp);
+       if (!ENGINE_init(engine))
+               return 0;
+       if (meth->finish) meth->finish(dsa);
+       dsa->engine = engine;
+       meth = ENGINE_get_DSA(engine);
+       if (meth->init) meth->init(dsa);
+       /* SHOULD ERROR CHECK THIS!!! */
+       ENGINE_finish(mtmp);
+       return 1;
+       }
+#endif
 
 
+#if 0
 DSA *DSA_new_method(DSA_METHOD *meth)
+#else
+DSA *DSA_new_method(ENGINE *engine)
+#endif
        {
+       const DSA_METHOD *meth;
        DSA *ret;
 
-       ret=(DSA *)Malloc(sizeof(DSA));
+       ret=(DSA *)OPENSSL_malloc(sizeof(DSA));
        if (ret == NULL)
                {
                DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
                return(NULL);
                }
-       if(meth) ret->meth = meth;
-       else ret->meth = DSA_get_default_method();
+       if(engine)
+               ret->engine = engine;
+       else
+               {
+               if((ret->engine=ENGINE_get_default_DSA()) == NULL)
+                       {
+                       OPENSSL_free(ret);
+                       return NULL;
+                       }
+               }
+       meth = ENGINE_get_DSA(ret->engine);
        ret->pad=0;
        ret->version=0;
        ret->write_params=1;
@@ -124,20 +172,21 @@ DSA *DSA_new_method(DSA_METHOD *meth)
        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;
+       CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
+       if ((meth->init != NULL) && !meth->init(ret))
                {
-               Free(ret);
+               CRYPTO_free_ex_data(dsa_meth,ret,&ret->ex_data);
+               OPENSSL_free(ret);
                ret=NULL;
                }
-       else
-               CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
        
        return(ret);
        }
 
 void DSA_free(DSA *r)
        {
+       const DSA_METHOD *meth;
        int i;
 
        if (r == NULL) return;
@@ -155,9 +204,11 @@ void DSA_free(DSA *r)
                }
 #endif
 
-       CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
+       meth = ENGINE_get_DSA(r->engine);
+       if(meth->finish) meth->finish(r);
+       ENGINE_finish(r->engine);
 
-       if(r->meth->finish) r->meth->finish(r);
+       CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
 
        if (r->p != NULL) BN_clear_free(r->p);
        if (r->q != NULL) BN_clear_free(r->q);
@@ -166,10 +217,10 @@ void DSA_free(DSA *r)
        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
        if (r->kinv != NULL) BN_clear_free(r->kinv);
        if (r->r != NULL) BN_clear_free(r->r);
-       Free(r);
+       OPENSSL_free(r);
        }
 
-int DSA_size(DSA *r)
+int DSA_size(const DSA *r)
        {
        int ret,i;
        ASN1_INTEGER bs;
@@ -207,7 +258,7 @@ void *DSA_get_ex_data(DSA *d, int idx)
        }
 
 #ifndef NO_DH
-DH *DSA_dup_DH(DSA *r)
+DH *DSA_dup_DH(const DSA *r)
        {
        /* DSA has p, q, g, optional pub_key, optional priv_key.
         * DH has p, optional length, g, optional pub_key, optional priv_key.