7 files changed, 236 insertions, 33 deletions

diff --git a/src/lib/libcrypto/dh/Makefile.ssl b/src/lib/libcrypto/dh/Makefile.ssl
index 3b5ec0e115..8df60872ef 100644
--- a/src/lib/libcrypto/dh/Makefile.ssl
+++ b/src/lib/libcrypto/dh/Makefile.ssl
@@ -83,26 +83,30 @@ dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 dh_check.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dh_check.o: ../../include/openssl/opensslconf.h
-dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-dh_check.o: ../cryptlib.h
-dh_err.o: ../../include/openssl/bn.h ../../include/openssl/dh.h
-dh_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+dh_check.o: ../../include/openssl/stack.h ../cryptlib.h
+dh_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+dh_err.o: ../../include/openssl/dh.h ../../include/openssl/err.h
+dh_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dh_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 dh_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_gen.o: ../../include/openssl/stack.h ../cryptlib.h
+dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_gen.o: ../cryptlib.h
 dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_key.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 dh_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_key.o: ../../include/openssl/rand.h ../../include/openssl/stack.h
-dh_key.o: ../cryptlib.h
+dh_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dh_key.o: ../../include/openssl/stack.h ../cryptlib.h
 dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_lib.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
 dh_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dh_lib.o: ../cryptlib.h
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 2cc3797a94..c15b2ad483 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -68,10 +68,28 @@ extern "C" {
 #endif
 
 #include <openssl/bn.h>
+#include <openssl/crypto.h>
         
 #define DH_FLAG_CACHE_MONT_P    0x01
 
-typedef struct dh_st
+typedef struct dh_st DH;
+
+typedef struct dh_method {
+        const char *name;
+        /* Methods here */
+        int (*generate_key)(DH *dh);
+        int (*compute_key)(unsigned char *key,BIGNUM *pub_key,DH *dh);
+        int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+                                const BIGNUM *m, BN_CTX *ctx,
+                                BN_MONT_CTX *m_ctx); /* Can be null */
+
+        int (*init)(DH *dh);
+        int (*finish)(DH *dh);
+        int flags;
+        char *app_data;
+} DH_METHOD;
+
+struct dh_st
         {
         /* This first argument is used to pick up errors when
          * a DH is passed instead of a EVP_PKEY */
@@ -80,12 +98,22 @@ typedef struct dh_st
         BIGNUM *p;
         BIGNUM *g;
         int length; /* optional */
-        BIGNUM *pub_key;        /* y */
+        BIGNUM *pub_key;        /* g^x */
         BIGNUM *priv_key;       /* x */
 
         int flags;
         char *method_mont_p;
-        } DH;
+        /* Place holders if we want to do X9.42 DH */
+        BIGNUM *q;
+        BIGNUM *j;
+        unsigned char *seed;
+        int seedlen;
+        BIGNUM *counter;
+
+        int references;
+        CRYPTO_EX_DATA ex_data;
+        DH_METHOD *meth;
+        };
 
 #define DH_GENERATOR_2          2
 /* #define DH_GENERATOR_3       3 */
@@ -93,10 +121,14 @@ typedef struct dh_st
 
 /* DH_check error codes */
 #define DH_CHECK_P_NOT_PRIME            0x01
-#define DH_CHECK_P_NOT_STRONG_PRIME     0x02
+#define DH_CHECK_P_NOT_SAFE_PRIME       0x02
 #define DH_UNABLE_TO_CHECK_GENERATOR    0x04
 #define DH_NOT_SUITABLE_GENERATOR       0x08
 
+/* primes p where (p-1)/2 is prime too are called "safe"; we define
+   this for backward compatibility: */
+#define DH_CHECK_P_NOT_STRONG_PRIME     DH_CHECK_P_NOT_SAFE_PRIME
+
 #define DHparams_dup(x) (DH *)ASN1_dup((int (*)())i2d_DHparams, \
                 (char *(*)())d2i_DHparams,(char *)(x))
 #define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
@@ -113,9 +145,20 @@ typedef struct dh_st
                 (unsigned char *)(x))
 #endif
 
+DH_METHOD *DH_OpenSSL(void);
+
+void DH_set_default_method(DH_METHOD *meth);
+DH_METHOD *DH_get_default_method(void);
+DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth);
+DH *DH_new_method(DH_METHOD *meth);
+
 DH *    DH_new(void);
 void    DH_free(DH *dh);
 int     DH_size(DH *dh);
+int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int DH_set_ex_data(DH *d, int idx, void *arg);
+void *DH_get_ex_data(DH *d, int idx);
 DH *    DH_generate_parameters(int prime_len,int generator,
                 void (*callback)(int,int,void *),void *cb_arg);
 int     DH_check(DH *dh,int *codes);
diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index 95ce9cfad0..7e5cfd8bfc 100644
--- a/src/lib/libcrypto/dh/dh_check.c
+++ b/src/lib/libcrypto/dh/dh_check.c
@@ -61,7 +61,7 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
-/* Check that p is a strong prime and
+/* Check that p is a safe prime and
  * if g is 2, 3 or 5, check that is is a suitable generator
  * where
  * for 2, p mod 24 == 11
@@ -88,11 +88,13 @@ int DH_check(DH *dh, int *ret)
                 l=BN_mod_word(dh->p,24);
                 if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
                 }
-/*      else if (BN_is_word(dh->g,DH_GENERATOR_3))
+#if 0
+        else if (BN_is_word(dh->g,DH_GENERATOR_3))
                 {
                 l=BN_mod_word(dh->p,12);
                 if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }*/
+                }
+#endif
         else if (BN_is_word(dh->g,DH_GENERATOR_5))
                 {
                 l=BN_mod_word(dh->p,10);
@@ -108,7 +110,7 @@ int DH_check(DH *dh, int *ret)
                 {
                 if (!BN_rshift1(q,dh->p)) goto err;
                 if (!BN_is_prime(q,BN_prime_checks,NULL,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_STRONG_PRIME;
+                        *ret|=DH_CHECK_P_NOT_SAFE_PRIME;
                 }
         ok=1;
 err:
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
index b7bcd2c7a4..7a6a38fbb4 100644
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ b/src/lib/libcrypto/dh/dh_gen.c
@@ -72,14 +72,14 @@
  * Having said all that,
  * there is another special case method for the generators 2, 3 and 5.
  * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5  <<<<< does not work for strong primes.
+ * for 3, p mod 12 == 5  <<<<< does not work for safe primes.
  * for 5, p mod 10 == 3 or 7
  *
  * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the
  * special generators and for answering some of my questions.
  *
  * I've implemented the second simple method :-).
- * Since DH should be using a strong prime (both p and q are prime),
+ * Since DH should be using a safe prime (both p and q are prime),
  * this generator function can take a very very long time to run.
  */
 
@@ -95,9 +95,10 @@ DH *DH_generate_parameters(int prime_len, int generator,
         if (ret == NULL) goto err;
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
-        t1= &(ctx->bn[0]);
-        t2= &(ctx->bn[1]);
-        ctx->tos=2;
+        BN_CTX_start(ctx);
+        t1 = BN_CTX_get(ctx);
+        t2 = BN_CTX_get(ctx);
+        if (t1 == NULL || t2 == NULL) goto err;
         
         if (generator == DH_GENERATOR_2)
                 {
@@ -105,7 +106,7 @@ DH *DH_generate_parameters(int prime_len, int generator,
                 BN_set_word(t2,11);
                 g=2;
                 }
-#ifdef undef  /* does not work for strong primes */
+#ifdef undef  /* does not work for safe primes */
         else if (generator == DH_GENERATOR_3)
                 {
                 BN_set_word(t1,12);
@@ -138,7 +139,11 @@ err:
                 ok=0;
                 }
 
-        if (ctx != NULL) BN_CTX_free(ctx);
+        if (ctx != NULL)
+                {
+                BN_CTX_end(ctx);
+                BN_CTX_free(ctx);
+                }
         if (!ok && (ret != NULL))
                 {
                 DH_free(ret);
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index cede53bfc1..0c7eeaf260 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -62,8 +62,42 @@
 #include <openssl/rand.h>
 #include <openssl/dh.h>
 
+static int generate_key(DH *dh);
+static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh);
+static int dh_bn_mod_exp(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+                        const BIGNUM *m, BN_CTX *ctx,
+                        BN_MONT_CTX *m_ctx);
+static int dh_init(DH *dh);
+static int dh_finish(DH *dh);
+
 int DH_generate_key(DH *dh)
         {
+        return dh->meth->generate_key(dh);
+        }
+
+int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
+        {
+        return dh->meth->compute_key(key, pub_key, dh);
+        }
+
+static DH_METHOD dh_ossl = {
+"OpenSSL DH Method",
+generate_key,
+compute_key,
+dh_bn_mod_exp,
+dh_init,
+dh_finish,
+0,
+NULL
+};
+
+DH_METHOD *DH_OpenSSL(void)
+{
+        return &dh_ossl;
+}
+
+static int generate_key(DH *dh)
+        {
         int ok=0;
         unsigned int i;
         BN_CTX ctx;
@@ -103,7 +137,8 @@ int DH_generate_key(DH *dh)
                 }
         mont=(BN_MONT_CTX *)dh->method_mont_p;
 
-        if (!BN_mod_exp_mont(pub_key,dh->g,priv_key,dh->p,&ctx,mont)) goto err;
+        if (!dh->meth->bn_mod_exp(dh, pub_key,dh->g,priv_key,dh->p,&ctx,mont))
+                                                                goto err;
                 
         dh->pub_key=pub_key;
         dh->priv_key=priv_key;
@@ -118,7 +153,7 @@ err:
         return(ok);
         }
 
-int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
+static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
         {
         BN_CTX ctx;
         BN_MONT_CTX *mont;
@@ -126,7 +161,8 @@ int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
         int ret= -1;
 
         BN_CTX_init(&ctx);
-        tmp= &(ctx.bn[ctx.tos++]);
+        BN_CTX_start(&ctx);
+        tmp = BN_CTX_get(&ctx);
         
         if (dh->priv_key == NULL)
                 {
@@ -141,7 +177,7 @@ int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
                 }
 
         mont=(BN_MONT_CTX *)dh->method_mont_p;
-        if (!BN_mod_exp_mont(tmp,pub_key,dh->priv_key,dh->p,&ctx,mont))
+        if (!dh->meth->bn_mod_exp(dh, tmp,pub_key,dh->priv_key,dh->p,&ctx,mont))
                 {
                 DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);
                 goto err;
@@ -149,6 +185,27 @@ int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
 
         ret=BN_bn2bin(tmp,key);
 err:
+        BN_CTX_end(&ctx);
         BN_CTX_free(&ctx);
         return(ret);
         }
+
+static int dh_bn_mod_exp(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+                        const BIGNUM *m, BN_CTX *ctx,
+                        BN_MONT_CTX *m_ctx)
+{
+        return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
+}
+
+static int dh_init(DH *dh)
+{
+        dh->flags |= DH_FLAG_CACHE_MONT_P;
+        return(1);
+}
+
+static int dh_finish(DH *dh)
+{
+        if(dh->method_mont_p)
+                BN_MONT_CTX_free((BN_MONT_CTX *)dh->method_mont_p);
+        return(1);
+}
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index 61e0720e8a..6c21463028 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -63,16 +63,49 @@
 
 const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 
+static 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)
+{
+        default_DH_method = meth;
+}
+
+DH_METHOD *DH_get_default_method(void)
+{
+        if(!default_DH_method) default_DH_method = DH_OpenSSL();
+        return default_DH_method;
+}
+
+DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth)
+{
+        DH_METHOD *mtmp;
+        mtmp = dh->meth;
+        if (mtmp->finish) mtmp->finish(dh);
+        dh->meth = meth;
+        if (meth->init) meth->init(dh);
+        return mtmp;
+}
+
 DH *DH_new(void)
+{
+        return DH_new_method(NULL);
+}
+
+DH *DH_new_method(DH_METHOD *meth)
         {
         DH *ret;
-
         ret=(DH *)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;
         ret->pad=0;
         ret->version=0;
         ret->p=NULL;
@@ -80,23 +113,74 @@ DH *DH_new(void)
         ret->length=0;
         ret->pub_key=NULL;
         ret->priv_key=NULL;
-        ret->flags=DH_FLAG_CACHE_MONT_P;
+        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))
+                {
+                Free(ret);
+                ret=NULL;
+                }
+        else
+                CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
         return(ret);
         }
 
 void DH_free(DH *r)
         {
+        int i;
         if(r == NULL) return;
+        i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
+#ifdef REF_PRINT
+        REF_PRINT("DH",r);
+#endif
+        if (i > 0) return;
+#ifdef REF_CHECK
+        if (i < 0)
+                {
+                fprintf(stderr,"DH_free, bad reference count\n");
+                abort();
+        }
+#endif
+
+        CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
+
+        if(r->meth->finish) r->meth->finish(r);
+
         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) 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);
-        if (r->method_mont_p != NULL)
-                BN_MONT_CTX_free((BN_MONT_CTX *)r->method_mont_p);
         Free(r);
         }
 
+int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+        {
+        dh_meth_num++;
+        return(CRYPTO_get_ex_new_index(dh_meth_num-1,
+                &dh_meth,argl,argp,new_func,dup_func,free_func));
+        }
+
+int DH_set_ex_data(DH *d, int idx, void *arg)
+        {
+        return(CRYPTO_set_ex_data(&d->ex_data,idx,arg));
+        }
+
+void *DH_get_ex_data(DH *d, int idx)
+        {
+        return(CRYPTO_get_ex_data(&d->ex_data,idx));
+        }
+
 int DH_size(DH *dh)
         {
         return(BN_num_bytes(dh->p));
diff --git a/src/lib/libcrypto/dh/dhtest.c b/src/lib/libcrypto/dh/dhtest.c
index 770331971f..d66c28455e 100644
--- a/src/lib/libcrypto/dh/dhtest.c
+++ b/src/lib/libcrypto/dh/dhtest.c
@@ -65,6 +65,7 @@
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
+#include <openssl/rand.h>
 
 #ifdef NO_DH
 int main(int argc, char *argv[])
@@ -87,19 +88,23 @@ static void MS_CALLBACK cb(int p, int n, void *arg);
 #include "bss_file.c"
 #endif
 
-BIO *out=NULL;
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
 
 int main(int argc, char *argv[])
         {
-        DH *a,*b;
+        DH *a;
+        DH *b=NULL;
         char buf[12];
         unsigned char *abuf=NULL,*bbuf=NULL;
         int i,alen,blen,aout,bout,ret=1;
+        BIO *out;
 
 #ifdef WIN32
         CRYPTO_malloc_init();
 #endif
 
+        RAND_seed(rnd_seed, sizeof rnd_seed);
+
         out=BIO_new(BIO_s_file());
         if (out == NULL) exit(1);
         BIO_set_fp(out,stdout,BIO_NOCLOSE);
@@ -167,6 +172,9 @@ int main(int argc, char *argv[])
 err:
         if (abuf != NULL) Free(abuf);
         if (bbuf != NULL) Free(bbuf);
+        if(b != NULL) DH_free(b);
+        if(a != NULL) DH_free(a);
+        BIO_free(out);
         exit(ret);
         return(ret);
         }