Commit e7ef1a56 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make all engines available in the openssl application.

parent 458d356d

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 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.

     [Richard Levitte]

apps/apps.h

+5 −3
Original line number Diff line number Diff line
@@ -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

apps/engine.c

+0 −5
Original line number Diff line number Diff line
@@ -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))

			{

apps/openssl.c

+1 −0
Original line number Diff line number Diff line
@@ -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");