diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
| commit | 96de7a4399a8c71cbb70d6252fa77acfd76b3f09 (patch) | |
| tree | e6f6e4aad1952944ccd27e9eb47ea48b9a78dde7 /lib/libcrypto/engine/eng_lib.c | |
| parent | ec7710fe8f10fb624fbc33c0bbad2474e0c26979 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/engine/eng_lib.c')
| -rw-r--r-- | lib/libcrypto/engine/eng_lib.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/libcrypto/engine/eng_lib.c b/lib/libcrypto/engine/eng_lib.c index a66d0f08af2..5815b867f49 100644 --- a/lib/libcrypto/engine/eng_lib.c +++ b/lib/libcrypto/engine/eng_lib.c @@ -56,11 +56,8 @@ * */ -#include <openssl/crypto.h> -#include "cryptlib.h" #include "eng_int.h" -#include <openssl/rand.h> /* FIXME: This shouldn't be needed */ -#include <openssl/engine.h> +#include <openssl/rand.h> /* The "new"/"free" stuff first */ @@ -92,6 +89,7 @@ void engine_set_all_null(ENGINE *e) e->dsa_meth = NULL; e->dh_meth = NULL; e->rand_meth = NULL; + e->store_meth = NULL; e->ciphers = NULL; e->digests = NULL; e->destroy = NULL; @@ -110,7 +108,7 @@ int engine_free_util(ENGINE *e, int locked) if(e == NULL) { - ENGINEerr(ENGINE_F_ENGINE_FREE, + ENGINEerr(ENGINE_F_ENGINE_FREE_UTIL, ERR_R_PASSED_NULL_PARAMETER); return 0; } @@ -319,3 +317,13 @@ const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e) { return e->cmd_defns; } + +/* eng_lib.o is pretty much linked into anything that touches ENGINE already, so + * put the "static_state" hack here. */ + +static int internal_static_hack = 0; + +void *ENGINE_get_static_state(void) + { + return &internal_static_hack; + } |