Initial support for DSA_METHOD...

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

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index bfa9ca28d7874d404a4e5b4d8fad395e096648ae..ff8b254b40d904a60ffb3c81ad6e992bb0a39e8f 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -56,21 +56,55 @@
  * [including the GNU Public Licence.]
  */
 
-/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "asn1.h"
-
-char *DSA_version="\0DSA part of SSLeay 0.9.1a 06-Jul-1998";
-
-DSA *DSA_new()
+#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 *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));
+       if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();
+       if(meth) ret->meth = meth;
+       else ret->meth = default_DSA_method;
        if (ret == NULL)
                {
                DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
@@ -82,7 +116,6 @@ DSA *DSA_new()
        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,11 +125,20 @@ DSA *DSA_new()
        ret->method_mont_p=NULL;
 
        ret->references=1;
+       /* ret->flags=DSA_FLAG_CACHE_MONT_P; */
+       ret->flags=ret->meth->flags;
+       if ((ret->meth->init != NULL) && !ret->meth->init(ret))
+               {
+               Free(ret);
+               ret=NULL;
+               }
+       else
+               CRYPTO_new_ex_data(dsa_meth,(char *)ret,&ret->ex_data);
+       
        return(ret);
        }
 
-void DSA_free(r)
-DSA *r;
+void DSA_free(DSA *r)
        {
        int i;
 
@@ -115,6 +157,10 @@ DSA *r;
                }
 #endif
 
+       CRYPTO_free_ex_data(dsa_meth, (char *)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);
@@ -127,8 +173,7 @@ DSA *r;
        Free(r);
        }
 
-int DSA_size(r)
-DSA *r;
+int DSA_size(DSA *r)
        {
        int ret,i;
        ASN1_INTEGER bs;
@@ -147,3 +192,58 @@ DSA *r;
        return(ret);
        }
 
+int DSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
+            int (*dup_func)(), void (*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, char *arg)
+       {
+       return(CRYPTO_set_ex_data(&d->ex_data,idx,arg));
+       }
+
+char *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