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

Make necessary tweaks to apps/ files due to recent ENGINE surgery. See

Browse Source 
crypto/engine/README for details.
This commit is contained in:
Geoff Thorpe 2001-09-25 20:35:01 +00:00
parent cb78486d97
commit 6dc5d570d0
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps.c
View File

@ -1167,8 +1167,6 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
return NULL; return NULL;
} }
ENGINE_load_engine_ciphers(e);
BIO_printf(err,"engine \"%s\" set.\n", engine); BIO_printf(err,"engine \"%s\" set.\n", engine);
/* Free our "structural" reference. */ /* Free our "structural" reference. */

12
apps/apps.h
View File

@ -126,21 +126,21 @@ extern BIO *bio_err;
# ifdef _O_BINARY # ifdef _O_BINARY
# define apps_startup() \ # define apps_startup() \
do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
ERR_load_crypto_strings(); \ ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \ ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \
setup_ui_method(); } while(0) setup_ui_method(); } while(0)
# else # else
# define apps_startup() \ # define apps_startup() \
do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
ERR_load_crypto_strings(); \ ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \ ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \
setup_ui_method(); } while(0) setup_ui_method(); } while(0)
# endif # endif
# else # else
# define apps_startup() \ # define apps_startup() \
do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \ do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
ERR_load_crypto_strings(); \ ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
ENGINE_load_builtin_engines(); setup_ui_method(); } while(0) ENGINE_register_all_complete(); setup_ui_method(); } while(0)
# endif # endif
# define apps_shutdown() \ # define apps_shutdown() \
do { destroy_ui_method(); EVP_cleanup(); \ do { destroy_ui_method(); EVP_cleanup(); \

4
apps/engine.c
View File

@ -430,7 +430,9 @@ skip_arg_loop:
{ {
int cap_size = 256; int cap_size = 256;
char *cap_buf = NULL; char *cap_buf = NULL;
#if 0 /* Awaiting EVP_[CIPHER|DIGEST] refit */
int k,n; int k,n;
#endif
if (ENGINE_get_RSA(e) != NULL if (ENGINE_get_RSA(e) != NULL
&& !append_buf(&cap_buf, "RSA", && !append_buf(&cap_buf, "RSA",
@ -449,12 +451,14 @@ skip_arg_loop:
&cap_size, 256)) &cap_size, 256))
goto end; goto end;
#if 0
n=ENGINE_cipher_num(e); n=ENGINE_cipher_num(e);
for(k=0 ; k < n ; ++k) for(k=0 ; k < n ; ++k)
if(!append_buf(&cap_buf, if(!append_buf(&cap_buf,
OBJ_nid2sn(ENGINE_get_cipher(e, k)->nid), OBJ_nid2sn(ENGINE_get_cipher(e, k)->nid),
&cap_size, 256)) &cap_size, 256))
goto end; goto end;
#endif
if (cap_buf && (*cap_buf != '\0')) if (cap_buf && (*cap_buf != '\0'))
BIO_printf(bio_out, " [%s]", cap_buf); BIO_printf(bio_out, " [%s]", cap_buf);

2
apps/speed.c
View File

@ -570,7 +570,7 @@ int MAIN(int argc, char **argv)
#ifndef RSA_NULL #ifndef RSA_NULL
if (strcmp(*argv,"openssl") == 0) if (strcmp(*argv,"openssl") == 0)
{ {
RSA_set_default_openssl_method(RSA_PKCS1_SSLeay()); RSA_set_default_method(RSA_PKCS1_SSLeay());
j--; j--;
} }
else else