There have been a number of complaints from a number of sources that names

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

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 1bd89ae4c3895e5434a5c11220f35ffc2f802967..be30d18b8a05ee45c62295aab3909378befe05fe 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -60,29 +60,61 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "asn1.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/asn1.h>
 
 const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 
+static 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)
+{
+       default_DSA_method = meth;
+}
+
+DSA_METHOD *DSA_get_default_method(void)
+{
+       if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();
+       return default_DSA_method;
+}
+
 DSA *DSA_new(void)
+{
+       return DSA_new_method(NULL);
+}
+
+DSA_METHOD *DSA_set_method(DSA *dsa, DSA_METHOD *meth)
+{
+        DSA_METHOD *mtmp;
+        mtmp = dsa->meth;
+        if (mtmp->finish) mtmp->finish(dsa);
+        dsa->meth = meth;
+        if (meth->init) meth->init(dsa);
+        return mtmp;
+}
+
+
+DSA *DSA_new_method(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();
        ret->pad=0;
        ret->version=0;
        ret->write_params=1;
        ret->p=NULL;
        ret->q=NULL;
        ret->g=NULL;
-       ret->flags=DSA_FLAG_CACHE_MONT_P;
 
        ret->pub_key=NULL;
        ret->priv_key=NULL;
@@ -92,6 +124,15 @@ DSA *DSA_new(void)
        ret->method_mont_p=NULL;
 
        ret->references=1;
+       ret->flags=ret->meth->flags;
+       if ((ret->meth->init != NULL) && !ret->meth->init(ret))
+               {
+               OPENSSL_free(ret);
+               ret=NULL;
+               }
+       else
+               CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
+       
        return(ret);
        }
 
@@ -114,6 +155,10 @@ void DSA_free(DSA *r)
                }
 #endif
 
+       CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
+
+       if(r->meth->finish) r->meth->finish(r);
+
        if (r->p != NULL) BN_clear_free(r->p);
        if (r->q != NULL) BN_clear_free(r->q);
        if (r->g != NULL) BN_clear_free(r->g);
@@ -121,9 +166,7 @@ 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);
-       if (r->method_mont_p != NULL)
-               BN_MONT_CTX_free((BN_MONT_CTX *)r->method_mont_p);
-       Free(r);
+       OPENSSL_free(r);
        }
 
 int DSA_size(DSA *r)
@@ -145,3 +188,58 @@ int DSA_size(DSA *r)
        return(ret);
        }
 
+int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+            CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+        {
+       dsa_meth_num++;
+       return(CRYPTO_get_ex_new_index(dsa_meth_num-1,
+               &dsa_meth,argl,argp,new_func,dup_func,free_func));
+        }
+
+int DSA_set_ex_data(DSA *d, int idx, void *arg)
+       {
+       return(CRYPTO_set_ex_data(&d->ex_data,idx,arg));
+       }
+
+void *DSA_get_ex_data(DSA *d, int idx)
+       {
+       return(CRYPTO_get_ex_data(&d->ex_data,idx));
+       }
+
+#ifndef NO_DH
+DH *DSA_dup_DH(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.
+        */ 
+
+       DH *ret = NULL;
+
+       if (r == NULL)
+               goto err;
+       ret = DH_new();
+       if (ret == NULL)
+               goto err;
+       if (r->p != NULL) 
+               if ((ret->p = BN_dup(r->p)) == NULL)
+                       goto err;
+       if (r->q != NULL)
+               ret->length = BN_num_bits(r->q);
+       if (r->g != NULL)
+               if ((ret->g = BN_dup(r->g)) == NULL)
+                       goto err;
+       if (r->pub_key != NULL)
+               if ((ret->pub_key = BN_dup(r->pub_key)) == NULL)
+                       goto err;
+       if (r->priv_key != NULL)
+               if ((ret->priv_key = BN_dup(r->priv_key)) == NULL)
+                       goto err;
+
+       return ret;
+
+ err:
+       if (ret != NULL)
+               DH_free(ret);
+       return NULL;
+       }
+#endif