diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:00:51 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2001-09-25 20:00:51 +0000 |
| commit | b6d1e52d454bb321153c70cf763945d4b0d4f78e (patch) | |
| tree | c13376b1794f1605a8f9e84ad9b74ca4dcf9177f /crypto/engine/eng_dyn.c | |
| parent | f185e725a00a76cee0bcd0a3beb92a257d2b6325 (diff) | |
This change replaces the ENGINE's underlying mechanics with the new
ENGINE_TABLE-based stuff - as described in crypto/engine/README.
Associated miscellaneous changes;
- the previous cipher/digest hooks that hardwired directly to EVP's
OBJ_NAME-based storage have been backed out. New cipher/digest support
has been constructed and will be committed shortly.
- each implementation defines its own ENGINE_load_<name> function now.
- the "openssl" ENGINE isn't needed or loaded any more.
- core (not algorithm or class specific) ENGINE code has been split into
multiple files to increase readability and decrease linker bloat.
- ENGINE_cpy() has been removed as it wasn't really a good idea in the
first place and now, because of registration issues, can't be
meaningfully defined any more.
- BN_MOD_EXP[_CRT] support is removed as per the README.
- a bug in enginetest.c has been fixed.
NB: This commit almost certainly breaks compilation until subsequent
changes are committed.
Diffstat (limited to 'crypto/engine/eng_dyn.c')
| -rw-r--r-- | crypto/engine/eng_dyn.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index 561d58e5e4..8fd7078678 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -236,9 +236,7 @@ static dynamic_data_ctx *dynamic_get_data_ctx(ENGINE *e) return ctx; } -/* As this is only ever called once, there's no need for locking - * (indeed - the lock will already be held by our caller!!!) */ -ENGINE *ENGINE_dynamic(void) +static ENGINE *engine_dynamic(void) { ENGINE *ret = ENGINE_new(); if(!ret) @@ -257,6 +255,20 @@ ENGINE *ENGINE_dynamic(void) return ret; } +void ENGINE_load_dynamic(void) + { + ENGINE *toadd = engine_dynamic(); + if(!toadd) return; + ENGINE_add(toadd); + /* If the "add" worked, it gets a structural reference. So either way, + * we release our just-created reference. */ + ENGINE_free(toadd); + /* If the "add" didn't work, it was probably a conflict because it was + * already added (eg. someone calling ENGINE_load_blah then calling + * ENGINE_load_builtin_engines() perhaps). */ + ERR_clear_error(); + } + static int dynamic_init(ENGINE *e) { /* We always return failure - the "dyanamic" engine itself can't be used |