#include "cryptlib.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
-#include <openssl/engine.h>
const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
-static const DH_METHOD *default_DH_method = NULL;
+static DH_METHOD *default_DH_method = NULL;
static int dh_meth_num = 0;
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
-void DH_set_default_openssl_method(const DH_METHOD *meth)
+void DH_set_default_method(DH_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_DH_method != meth)
- {
- default_DH_method = meth;
- e = ENGINE_by_id("openssl");
- if(e)
- {
- ENGINE_set_DH(e, meth);
- ENGINE_free(e);
- }
- }
+ default_DH_method = meth;
}
-const DH_METHOD *DH_get_default_openssl_method(void)
+DH_METHOD *DH_get_default_method(void)
{
if(!default_DH_method) default_DH_method = DH_OpenSSL();
return default_DH_method;
}
-#if 0
DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth)
{
DH_METHOD *mtmp;
if (meth->init) meth->init(dh);
return mtmp;
}
-#else
-int DH_set_method(DH *dh, ENGINE *engine)
-{
- ENGINE *mtmp;
- const DH_METHOD *meth;
- mtmp = dh->engine;
- meth = ENGINE_get_DH(mtmp);
- if (!ENGINE_init(engine))
- return 0;
- if (meth->finish) meth->finish(dh);
- dh->engine= engine;
- meth = ENGINE_get_DH(engine);
- if (meth->init) meth->init(dh);
- /* SHOULD ERROR CHECK THIS!!! */
- ENGINE_finish(mtmp);
- return 1;
-}
-#endif
DH *DH_new(void)
{
return DH_new_method(NULL);
}
-#if 0
DH *DH_new_method(DH_METHOD *meth)
-#else
-DH *DH_new_method(ENGINE *engine)
-#endif
{
- const DH_METHOD *meth;
DH *ret;
ret=(DH *)OPENSSL_malloc(sizeof(DH));
DHerr(DH_F_DH_NEW,ERR_R_MALLOC_FAILURE);
return(NULL);
}
-
- if (engine)
- {
- if(ENGINE_init(engine))
- ret->engine = engine;
- else
- ret->engine = NULL;
- }
- else
- ret->engine=ENGINE_get_default_DH();
- if(ret->engine == NULL)
- {
- DHerr(DH_F_DH_NEW,ERR_LIB_ENGINE);
- OPENSSL_free(ret);
- return NULL;
- }
- meth = ENGINE_get_DH(ret->engine);
+ if(meth) ret->meth = meth;
+ else ret->meth = DH_get_default_method();
ret->pad=0;
ret->version=0;
ret->p=NULL;
ret->counter = NULL;
ret->method_mont_p=NULL;
ret->references = 1;
- ret->flags=meth->flags;
+ ret->flags=ret->meth->flags;
CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
- if ((meth->init != NULL) && !meth->init(ret))
+ if ((ret->meth->init != NULL) && !ret->meth->init(ret))
{
CRYPTO_free_ex_data(dh_meth,ret,&ret->ex_data);
OPENSSL_free(ret);
void DH_free(DH *r)
{
- const DH_METHOD *meth;
int i;
if(r == NULL) return;
i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
}
#endif
- meth = ENGINE_get_DH(r->engine);
- if(meth->finish) meth->finish(r);
- ENGINE_finish(r->engine);
+ if(r->meth->finish) r->meth->finish(r);
CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
OPENSSL_free(r);
}
-int DH_up(DH *r)
- {
- int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DH);
-#ifdef REF_PRINT
- REF_PRINT("DH",r);
-#endif
-#ifdef REF_CHECK
- if (i < 2)
- {
- fprintf(stderr, "DH_up, bad reference count\n");
- abort();
- }
-#endif
- return ((i > 1) ? 1 : 0);
- }
-
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)
{
- if(CRYPTO_get_ex_new_index(dh_meth_num, &dh_meth, argl, argp,
- new_func, dup_func, free_func) < 0)
- return -1;
- return (dh_meth_num++);
+ 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_get_ex_data(&d->ex_data,idx));
}
-int DH_size(const DH *dh)
+int DH_size(DH *dh)
{
return(BN_num_bytes(dh->p));
}