From: Geoff Thorpe <geoff@openssl.org>
Date: Tue, 25 Sep 2001 20:35:01 +0000 (+0000)
Subject: Make necessary tweaks to apps/ files due to recent ENGINE surgery. See
X-Git-Tag: OpenSSL_0_9_6c~26^2~196
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=6dc5d570d09dfc4f2b4595f089f2a7536d82ad72

Make necessary tweaks to apps/ files due to recent ENGINE surgery. See
crypto/engine/README for details.
---

diff --git a/apps/apps.c b/apps/apps.c
index 628405ef1b..2c2974224f 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1167,8 +1167,6 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
 			return NULL;
 			}
 
-		ENGINE_load_engine_ciphers(e);
-
 		BIO_printf(err,"engine \"%s\" set.\n", engine);
 
 		/* Free our "structural" reference. */
diff --git a/apps/apps.h b/apps/apps.h
index 634775d35d..810710909c 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -126,21 +126,21 @@ extern BIO *bio_err;
 #    ifdef _O_BINARY
 #      define apps_startup() \
 		do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		ERR_load_crypto_strings(); \
-		OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
-                setup_ui_method(); } while(0)
+		ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+		ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \
+		setup_ui_method(); } while(0)
 #    else
 #      define apps_startup() \
 		do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		ERR_load_crypto_strings(); \
-		OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
-                setup_ui_method(); } while(0)
+		ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+		ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \
+		setup_ui_method(); } while(0)
 #    endif
 #  else
 #    define apps_startup() \
 		do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-		ERR_load_crypto_strings(); \
-		ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+		ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
+		ENGINE_register_all_complete(); setup_ui_method(); } while(0)
 #  endif
 #  define apps_shutdown() \
 		do { destroy_ui_method(); EVP_cleanup(); \
diff --git a/apps/engine.c b/apps/engine.c
index 1b2fc50cc2..ebaeeabf21 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -430,7 +430,9 @@ skip_arg_loop:
 				{
 				int cap_size = 256;
 				char *cap_buf = NULL;
+#if 0 /* Awaiting EVP_[CIPHER|DIGEST] refit */
 				int k,n;
+#endif
 
 				if (ENGINE_get_RSA(e) != NULL
 					&& !append_buf(&cap_buf, "RSA",
@@ -449,12 +451,14 @@ skip_arg_loop:
 						&cap_size, 256))
 					goto end;
 
+#if 0
 				n=ENGINE_cipher_num(e);
 				for(k=0 ; k < n ; ++k)
 					if(!append_buf(&cap_buf,
 						       OBJ_nid2sn(ENGINE_get_cipher(e, k)->nid),
 						       &cap_size, 256))
 						goto end;
+#endif
 
 				if (cap_buf && (*cap_buf != '\0'))
 					BIO_printf(bio_out, " [%s]", cap_buf);
diff --git a/apps/speed.c b/apps/speed.c
index 1dd4e46b36..09aa615c73 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -570,7 +570,7 @@ int MAIN(int argc, char **argv)
 #ifndef RSA_NULL
 			if (strcmp(*argv,"openssl") == 0) 
 			{
-			RSA_set_default_openssl_method(RSA_PKCS1_SSLeay());
+			RSA_set_default_method(RSA_PKCS1_SSLeay());
 			j--;
 			}
 		else