diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-11-06 22:03:00 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-11-06 22:03:00 +0000 |
| commit | e7ef1a561a566036277ca424c269e8518259365c (patch) | |
| tree | b499d6e267c4ac87d362f827d22a525488177ac9 /apps | |
| parent | 458d356db93f8d06f52cc730c94e39758267b5b7 (diff) | |
| download | openssl-e7ef1a561a566036277ca424c269e8518259365c.tar.gz | |
Make all engines available in the openssl application.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 8 | ||||
| -rw-r--r-- | apps/engine.c | 5 | ||||
| -rw-r--r-- | apps/openssl.c | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/apps/apps.h b/apps/apps.h index e8272a3973..11133cb1d2 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -122,14 +122,16 @@ extern BIO *bio_err; # ifdef _O_BINARY # define apps_startup() \ _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ - SSLeay_add_all_algorithms() + SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines() # else # define apps_startup() \ _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ - SSLeay_add_all_algorithms() + SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines() # endif # else -# define apps_startup() do_pipe_sig(); SSLeay_add_all_algorithms(); +# define apps_startup() \ + do_pipe_sig(); SSLeay_add_all_algorithms(); \ + ENGINE_load_builtin_engines() # endif #endif diff --git a/apps/engine.c b/apps/engine.c index ca5618b1a6..f11206f570 100644 --- a/apps/engine.c +++ b/apps/engine.c @@ -73,11 +73,8 @@ static char *engine_usage[]={ "usage: engine opts [engine ...]\n", " -v - verbose mode, a textual listing of the engines in OpenSSL\n", -#if 0 " -c - for each engine, also list the capabilities\n", -#endif " -t - for each engine, check that they are really available\n", -" -l - load all built-in engines\n", NULL }; @@ -153,8 +150,6 @@ int MAIN(int argc, char **argv) list_cap=1; else if (strcmp(*argv,"-t") == 0) test_avail=1; - else if (strcmp(*argv,"-l") == 0) - ENGINE_load_builtin_engines(); else if ((strncmp(*argv,"-h",2) == 0) || (strcmp(*argv,"-?") == 0)) { diff --git a/apps/openssl.c b/apps/openssl.c index 4f61006b73..cbb77b0c0a 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -112,6 +112,7 @@ int main(int Argc, char *Argv[]) BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT); ERR_load_crypto_strings(); + ENGINE_load_builtin_engines(); /* Lets load up our environment a little */ p=getenv("OPENSSL_CONF"); |