Omit padding in RC4_KEY on IA-64. The idea behind padding was to reserve

[openssl.git] / crypto / engine / eng_list.c

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 55b646da2400ba254868039f6481209e04c7df71..f337e0f3bc650b548d0c7fecbf551ac8a9abfddb 100644 (file)
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -61,10 +61,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 
 /* The linked-list of pointers to engine types. engine_list_head
  * incorporates an implicit structural reference but engine_list_tail
@@ -336,6 +333,7 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src)
        dest->ecdsa_meth = src->ecdsa_meth;
 #endif
        dest->rand_meth = src->rand_meth;
+       dest->store_meth = src->store_meth;
        dest->ciphers = src->ciphers;
        dest->digests = src->digests;
        dest->destroy = src->destroy;
@@ -399,7 +397,7 @@ ENGINE *ENGINE_by_id(const char *id)
 #ifdef OPENSSL_SYS_VMS
        if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
 #else
-       if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = OPENSSLDIR "/engines";
+       if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
 #endif
        iterator = ENGINE_by_id("dynamic");
        if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||