Step 7 of move of engines: Engines should not depend on private

[openssl.git] / engines / e_cswift.c

diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index 1b4e4e876ecac0253d85a74b3a839efe8a8bd1f1..23d7919da0f1744fee94da7965f5f08e9dce5196 100644 (file)
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -84,7 +84,7 @@
 #endif
 
 #define CSWIFT_LIB_NAME "cswift engine"
-#include "hw_cswift_err.c"
+#include "e_cswift_err.c"
 
 static int cswift_destroy(ENGINE *e);
 static int cswift_init(ENGINE *e);
@@ -978,7 +978,7 @@ static int cswift_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_cswift_id) != 0))
@@ -989,7 +989,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_CSWIFT */
 #endif /* !OPENSSL_NO_HW */