1 files changed, 140 insertions, 159 deletions

diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eng.c b/src/lib/libcrypto/dsa/dsa_lib.c
index 383a7045b2..96d8d0c4b4 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_eng.c
+++ b/src/lib/libcrypto/dsa/dsa_lib.c
@@ -1,4 +1,4 @@
-/* crypto/rsa/rsa_lib.c */
+/* crypto/dsa/dsa_lib.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,120 +56,103 @@
  * [including the GNU Public Licence.]
  */
 
+/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+
 #include <stdio.h>
-#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
+#include <openssl/dsa.h>
+#include <openssl/asn1.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
 
-const char RSA_version[]="RSA" OPENSSL_VERSION_PTEXT;
-
-static const RSA_METHOD *default_RSA_meth=NULL;
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
-RSA *RSA_new(void)
-        {
-        RSA *r=RSA_new_method(NULL);
+const char DSA_version[]="DSA" OPENSSL_VERSION_PTEXT;
 
-        return r;
-        }
+static const DSA_METHOD *default_DSA_method = NULL;
 
-void RSA_set_default_method(const RSA_METHOD *meth)
+void DSA_set_default_method(const DSA_METHOD *meth)
         {
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_SET_DEFAULT_METHOD, RSA_R_NON_FIPS_METHOD);
-                return;
-                }
-#endif
-        default_RSA_meth = meth;
+        default_DSA_method = meth;
         }
 
-const RSA_METHOD *RSA_get_default_method(void)
+const DSA_METHOD *DSA_get_default_method(void)
         {
-        if (default_RSA_meth == NULL)
+        if(!default_DSA_method)
                 {
-#ifdef RSA_NULL
-                default_RSA_meth=RSA_null_method();
-#else
-#if 0 /* was: #ifdef RSAref */
-                default_RSA_meth=RSA_PKCS1_RSAref();
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return FIPS_dsa_openssl();
+                else
+                        return DSA_OpenSSL();
 #else
-                default_RSA_meth=RSA_PKCS1_SSLeay();
-#endif
+                default_DSA_method = DSA_OpenSSL();
 #endif
                 }
-
-        return default_RSA_meth;
+        return default_DSA_method;
         }
 
-const RSA_METHOD *RSA_get_method(const RSA *rsa)
+DSA *DSA_new(void)
         {
-        return rsa->meth;
+        return DSA_new_method(NULL);
         }
 
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth)
+int DSA_set_method(DSA *dsa, const DSA_METHOD *meth)
         {
         /* NB: The caller is specifically setting a method, so it's not up to us
          * to deal with which ENGINE it comes from. */
-        const RSA_METHOD *mtmp;
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_SET_METHOD, RSA_R_NON_FIPS_METHOD);
-                return 0;
-                }
-#endif
-        mtmp = rsa->meth;
-        if (mtmp->finish) mtmp->finish(rsa);
+        const DSA_METHOD *mtmp;
+        mtmp = dsa->meth;
+        if (mtmp->finish) mtmp->finish(dsa);
 #ifndef OPENSSL_NO_ENGINE
-        if (rsa->engine)
+        if (dsa->engine)
                 {
-                ENGINE_finish(rsa->engine);
-                rsa->engine = NULL;
+                ENGINE_finish(dsa->engine);
+                dsa->engine = NULL;
                 }
 #endif
-        rsa->meth = meth;
-        if (meth->init) meth->init(rsa);
-        return 1;
+        dsa->meth = meth;
+        if (meth->init) meth->init(dsa);
+        return 1;
         }
 
-RSA *RSA_new_method(ENGINE *engine)
+DSA *DSA_new_method(ENGINE *engine)
         {
-        RSA *ret;
+        DSA *ret;
 
-        ret=(RSA *)OPENSSL_malloc(sizeof(RSA));
+        ret=(DSA *)OPENSSL_malloc(sizeof(DSA));
         if (ret == NULL)
                 {
-                RSAerr(RSA_F_RSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
-                return NULL;
+                DSAerr(DSA_F_DSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
+                return(NULL);
                 }
-
-        ret->meth = RSA_get_default_method();
+        ret->meth = DSA_get_default_method();
 #ifndef OPENSSL_NO_ENGINE
         if (engine)
                 {
                 if (!ENGINE_init(engine))
                         {
-                        RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
                         OPENSSL_free(ret);
                         return NULL;
                         }
                 ret->engine = engine;
                 }
         else
-                ret->engine = ENGINE_get_default_RSA();
+                ret->engine = ENGINE_get_default_DSA();
         if(ret->engine)
                 {
-                ret->meth = ENGINE_get_RSA(ret->engine);
+                ret->meth = ENGINE_get_DSA(ret->engine);
                 if(!ret->meth)
                         {
-                        RSAerr(RSA_F_RSA_NEW_METHOD,
+                        DSAerr(DSA_F_DSA_NEW_METHOD,
                                 ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
                         OPENSSL_free(ret);
@@ -177,172 +160,170 @@ RSA *RSA_new_method(ENGINE *engine)
                         }
                 }
 #endif
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(ret->meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_NEW_METHOD, RSA_R_NON_FIPS_METHOD);
-#ifndef OPENSSL_NO_ENGINE
-                if (ret->engine)
-                        ENGINE_finish(ret->engine);
-#endif
-                OPENSSL_free(ret);
-                return NULL;
-                }
-#endif
 
         ret->pad=0;
         ret->version=0;
-        ret->n=NULL;
-        ret->e=NULL;
-        ret->d=NULL;
+        ret->write_params=1;
         ret->p=NULL;
         ret->q=NULL;
-        ret->dmp1=NULL;
-        ret->dmq1=NULL;
-        ret->iqmp=NULL;
+        ret->g=NULL;
+
+        ret->pub_key=NULL;
+        ret->priv_key=NULL;
+
+        ret->kinv=NULL;
+        ret->r=NULL;
+        ret->method_mont_p=NULL;
+
         ret->references=1;
-        ret->_method_mod_n=NULL;
-        ret->_method_mod_p=NULL;
-        ret->_method_mod_q=NULL;
-        ret->blinding=NULL;
-        ret->mt_blinding=NULL;
-        ret->bignum_data=NULL;
-        ret->flags=ret->meth->flags;
-        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
+        ret->flags=ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW;
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
         if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                 {
 #ifndef OPENSSL_NO_ENGINE
                 if (ret->engine)
                         ENGINE_finish(ret->engine);
 #endif
-                CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
+                CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
                 OPENSSL_free(ret);
                 ret=NULL;
                 }
+        
         return(ret);
         }
 
-void RSA_free(RSA *r)
+void DSA_free(DSA *r)
         {
         int i;
 
         if (r == NULL) return;
 
-        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_RSA);
+        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_DSA);
 #ifdef REF_PRINT
-        REF_PRINT("RSA",r);
+        REF_PRINT("DSA",r);
 #endif
         if (i > 0) return;
 #ifdef REF_CHECK
         if (i < 0)
                 {
-                fprintf(stderr,"RSA_free, bad reference count\n");
+                fprintf(stderr,"DSA_free, bad reference count\n");
                 abort();
                 }
 #endif
 
-        if (r->meth->finish)
+        if(r->meth->finish)
                 r->meth->finish(r);
 #ifndef OPENSSL_NO_ENGINE
-        if (r->engine)
+        if(r->engine)
                 ENGINE_finish(r->engine);
 #endif
 
-        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data);
 
-        if (r->n != NULL) BN_clear_free(r->n);
-        if (r->e != NULL) BN_clear_free(r->e);
-        if (r->d != NULL) BN_clear_free(r->d);
         if (r->p != NULL) BN_clear_free(r->p);
         if (r->q != NULL) BN_clear_free(r->q);
-        if (r->dmp1 != NULL) BN_clear_free(r->dmp1);
-        if (r->dmq1 != NULL) BN_clear_free(r->dmq1);
-        if (r->iqmp != NULL) BN_clear_free(r->iqmp);
-        if (r->blinding != NULL) BN_BLINDING_free(r->blinding);
-        if (r->mt_blinding != NULL) BN_BLINDING_free(r->mt_blinding);
-        if (r->bignum_data != NULL) OPENSSL_free_locked(r->bignum_data);
+        if (r->g != NULL) BN_clear_free(r->g);
+        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
+        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);
         OPENSSL_free(r);
         }
 
-int RSA_up_ref(RSA *r)
+int DSA_up_ref(DSA *r)
         {
-        int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA);
+        int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DSA);
 #ifdef REF_PRINT
-        REF_PRINT("RSA",r);
+        REF_PRINT("DSA",r);
 #endif
 #ifdef REF_CHECK
         if (i < 2)
                 {
-                fprintf(stderr, "RSA_up_ref, bad reference count\n");
+                fprintf(stderr, "DSA_up_ref, bad reference count\n");
                 abort();
                 }
 #endif
         return ((i > 1) ? 1 : 0);
         }
 
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+int DSA_size(const DSA *r)
+        {
+        int ret,i;
+        ASN1_INTEGER bs;
+        unsigned char buf[4];   /* 4 bytes looks really small.
+                                   However, i2d_ASN1_INTEGER() will not look
+                                   beyond the first byte, as long as the second
+                                   parameter is NULL. */
+
+        i=BN_num_bits(r->q);
+        bs.length=(i+7)/8;
+        bs.data=buf;
+        bs.type=V_ASN1_INTEGER;
+        /* If the top bit is set the asn1 encoding is 1 larger. */
+        buf[0]=0xff;    
+
+        i=i2d_ASN1_INTEGER(&bs,NULL);
+        i+=i; /* r and s */
+        ret=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
+        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)
         {
-        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RSA, argl, argp,
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, argl, argp,
                                 new_func, dup_func, free_func);
         }
 
-int RSA_set_ex_data(RSA *r, int idx, void *arg)
+int DSA_set_ex_data(DSA *d, int idx, void *arg)
         {
-        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
+        return(CRYPTO_set_ex_data(&d->ex_data,idx,arg));
         }
 
-void *RSA_get_ex_data(const RSA *r, int idx)
+void *DSA_get_ex_data(DSA *d, int idx)
         {
-        return(CRYPTO_get_ex_data(&r->ex_data,idx));
+        return(CRYPTO_get_ex_data(&d->ex_data,idx));
         }
 
-int RSA_flags(const RSA *r)
+#ifndef OPENSSL_NO_DH
+DH *DSA_dup_DH(const DSA *r)
         {
-        return((r == NULL)?0:r->meth->flags);
-        }
+        /* DSA has p, q, g, optional pub_key, optional priv_key.
+         * DH has p, optional length, g, optional pub_key, optional priv_key,
+         * optional q.
+         */ 
 
-int RSA_memory_lock(RSA *r)
-        {
-        int i,j,k,off;
-        char *p;
-        BIGNUM *bn,**t[6],*b;
-        BN_ULONG *ul;
-
-        if (r->d == NULL) return(1);
-        t[0]= &r->d;
-        t[1]= &r->p;
-        t[2]= &r->q;
-        t[3]= &r->dmp1;
-        t[4]= &r->dmq1;
-        t[5]= &r->iqmp;
-        k=sizeof(BIGNUM)*6;
-        off=k/sizeof(BN_ULONG)+1;
-        j=1;
-        for (i=0; i<6; i++)
-                j+= (*t[i])->top;
-        if ((p=OPENSSL_malloc_locked((off+j)*sizeof(BN_ULONG))) == NULL)
-                {
-                RSAerr(RSA_F_RSA_MEMORY_LOCK,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        bn=(BIGNUM *)p;
-        ul=(BN_ULONG *)&(p[off]);
-        for (i=0; i<6; i++)
+        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)
                 {
-                b= *(t[i]);
-                *(t[i])= &(bn[i]);
-                memcpy((char *)&(bn[i]),(char *)b,sizeof(BIGNUM));
-                bn[i].flags=BN_FLG_STATIC_DATA;
-                bn[i].d=ul;
-                memcpy((char *)ul,b->d,sizeof(BN_ULONG)*b->top);
-                ul+=b->top;
-                BN_clear_free(b);
+                ret->length = BN_num_bits(r->q);
+                if ((ret->q = BN_dup(r->q)) == NULL)
+                        goto err;
                 }
-        
-        /* I should fix this so it can still be done */
-        r->flags&= ~(RSA_FLAG_CACHE_PRIVATE|RSA_FLAG_CACHE_PUBLIC);
+        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;
 
-        r->bignum_data=p;
-        return(1);
+ err:
+        if (ret != NULL)
+                DH_free(ret);
+        return NULL;
         }
+#endif