X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=engines%2Fe_ubsec.c;h=afb0c9ece6618249abcf68aeede471fe780c92ac;hp=ed8401ec162655ed0948b1caa4ae1efa08fe4a50;hb=4ebb5293fc7ae1fbb7c5cd8bbe114049bcd8685e;hpb=5572f482e797a5f6eee34ef7f04a8defde7bdecf

diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index ed8401ec16..afb0c9ece6 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -59,8 +59,9 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -74,7 +75,7 @@
 #endif
 
 #define UBSEC_LIB_NAME "ubsec engine"
-#include "hw_ubsec_err.c"
+#include "e_ubsec_err.c"
 
 #define FAIL_TO_SOFTWARE -15
 
@@ -143,6 +144,7 @@ static RSA_METHOD ubsec_rsa =
 	0,
 	NULL,
 	NULL,
+	NULL,
 	NULL
 	};
 #endif
@@ -242,6 +244,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_ubsec(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -264,6 +267,7 @@ void ENGINE_load_ubsec(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This is a process-global DSO handle used for loading and unloading
  * the UBSEC library. NB: This is only set (or unset) during an
@@ -1042,7 +1046,7 @@ static int ubsec_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_ubsec_id) != 0))
@@ -1053,7 +1057,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_UBSEC */
 #endif /* !OPENSSL_NO_HW */