diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:23:40 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:23:40 +0000 |
| commit | cb78486d97328121add07df466b7578076650a90 (patch) | |
| tree | 44de53e7516cf07786dcfaa9add109319fad16ac /crypto/dh/dh.h | |
| parent | 9c9aa4f145588500cd2d734d1901a31039f145b9 (diff) | |
This commits changes to various parts of libcrypto required by the recent
ENGINE surgery. DH, DSA, RAND, and RSA now use *both* "method" and ENGINE
pointers to manage their hooking with ENGINE. Previously their use of
"method" pointers was replaced by use of ENGINE references. See
crypto/engine/README for details.
Also, remove the ENGINE iterations from evp_test - even when the
cipher/digest code is committed in, this functionality would require a
different set of API calls.
Diffstat (limited to 'crypto/dh/dh.h')
| -rw-r--r-- | crypto/dh/dh.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index fe2da7abe3..65d61e2bb7 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -68,6 +68,7 @@ #endif #include <openssl/bn.h> #include <openssl/crypto.h> +#include <openssl/types.h> #define DH_FLAG_CACHE_MONT_P 0x01 @@ -115,11 +116,8 @@ struct dh_st int references; CRYPTO_EX_DATA ex_data; -#if 0 - DH_METHOD *meth; -#else - struct engine_st *engine; -#endif + const DH_METHOD *meth; + ENGINE *engine; }; #define DH_GENERATOR_2 2 @@ -154,15 +152,10 @@ struct dh_st const DH_METHOD *DH_OpenSSL(void); -void DH_set_default_openssl_method(const DH_METHOD *meth); -const DH_METHOD *DH_get_default_openssl_method(void); -#if 0 -const DH_METHOD *DH_set_method(DH *dh, const DH_METHOD *meth); -DH *DH_new_method(const DH_METHOD *meth); -#else -int DH_set_method(DH *dh, struct engine_st *engine); -DH *DH_new_method(struct engine_st *engine); -#endif +void DH_set_default_method(const DH_METHOD *meth); +const DH_METHOD *DH_get_default_method(void); +int DH_set_method(DH *dh, const DH_METHOD *meth); +DH *DH_new_method(ENGINE *engine); DH * DH_new(void); void DH_free(DH *dh); |