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 628405ef1bf0112e32134e69a57cc94a606eaeba..2c2974224fc920c2d49eeef95bcf64177e6d1db8 100644 (file)
--- 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 634775d35d184f145cb04194711e9ae8d613c5a6..810710909c35cbeece48c5f366abc4aad1fdec9e 100644 (file)
--- 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 1b2fc50cc2a00ae539225afa047efbdfede4cc9a..ebaeeabf210e9a5fb512d0be9531fda88a55491f 100644 (file)
--- 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 1dd4e46b36791e4722fc1fc73a010d9fe8c462b2..09aa615c73be470f27d909f6329c1916bce5bb72 100644 (file)
--- 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