generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make all engines available in the openssl application.

Browse Source
This commit is contained in:
Richard Levitte 2000-11-06 22:03:00 +00:00
parent 458d356db9
commit e7ef1a561a
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
*) Make it so the openssl application has all engines loaded by default.
[Richard Levitte]
*) Constify the BIGNUM routines a little more. *) Constify the BIGNUM routines a little more.
[Richard Levitte] [Richard Levitte]

8
apps/apps.h
View File

@ -122,14 +122,16 @@ extern BIO *bio_err;
# ifdef _O_BINARY # ifdef _O_BINARY
# define apps_startup() \ # define apps_startup() \
_fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
SSLeay_add_all_algorithms() SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
# else # else
# define apps_startup() \ # define apps_startup() \
_fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
SSLeay_add_all_algorithms() SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
# endif # endif
# else # 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
#endif #endif

5
apps/engine.c
View File

@ -73,11 +73,8 @@
static char *engine_usage[]={ static char *engine_usage[]={
"usage: engine opts [engine ...]\n", "usage: engine opts [engine ...]\n",
" -v - verbose mode, a textual listing of the engines in OpenSSL\n", " -v - verbose mode, a textual listing of the engines in OpenSSL\n",
#if 0
" -c - for each engine, also list the capabilities\n", " -c - for each engine, also list the capabilities\n",
#endif
" -t - for each engine, check that they are really available\n", " -t - for each engine, check that they are really available\n",
" -l - load all built-in engines\n",
NULL NULL
}; };
@ -153,8 +150,6 @@ int MAIN(int argc, char **argv)
list_cap=1; list_cap=1;
else if (strcmp(*argv,"-t") == 0) else if (strcmp(*argv,"-t") == 0)
test_avail=1; test_avail=1;
else if (strcmp(*argv,"-l") == 0)
ENGINE_load_builtin_engines();
else if ((strncmp(*argv,"-h",2) == 0) || else if ((strncmp(*argv,"-h",2) == 0) ||
(strcmp(*argv,"-?") == 0)) (strcmp(*argv,"-?") == 0))
{ {

1
apps/openssl.c
View File

@ -112,6 +112,7 @@ int main(int Argc, char *Argv[])
BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT); BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ENGINE_load_builtin_engines();
/* Lets load up our environment a little */ /* Lets load up our environment a little */
p=getenv("OPENSSL_CONF"); p=getenv("OPENSSL_CONF");