resolve conflicts

1 files changed, 13 insertions, 5 deletions

diff --git a/src/lib/libcrypto/engine/eng_lib.c b/src/lib/libcrypto/engine/eng_lib.c
index a66d0f08af..5815b867f4 100644
--- a/src/lib/libcrypto/engine/eng_lib.c
+++ b/src/lib/libcrypto/engine/eng_lib.c
@@ -56,11 +56,8 @@
  *
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/rand.h> /* FIXME: This shouldn't be needed */
-#include <openssl/engine.h>
+#include <openssl/rand.h>
 
 /* The "new"/"free" stuff first */
 
@@ -92,6 +89,7 @@ void engine_set_all_null(ENGINE *e)
         e->dsa_meth = NULL;
         e->dh_meth = NULL;
         e->rand_meth = NULL;
+        e->store_meth = NULL;
         e->ciphers = NULL;
         e->digests = NULL;
         e->destroy = NULL;
@@ -110,7 +108,7 @@ int engine_free_util(ENGINE *e, int locked)
 
         if(e == NULL)
                 {
-                ENGINEerr(ENGINE_F_ENGINE_FREE,
+                ENGINEerr(ENGINE_F_ENGINE_FREE_UTIL,
                         ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
                 }
@@ -319,3 +317,13 @@ const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e)
         {
         return e->cmd_defns;
         }
+
+/* eng_lib.o is pretty much linked into anything that touches ENGINE already, so
+ * put the "static_state" hack here. */
+
+static int internal_static_hack = 0;
+
+void *ENGINE_get_static_state(void)
+        {
+        return &internal_static_hack;
+        }