Select updates from HEAD

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 64a13e754c7801d00ef2c83948ac59c2e0e4e2f4..4095513b7a215732b36c6e637a2bf2c4d26b0ccf 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -1215,7 +1215,12 @@ static RAND_METHOD padlock_rand = {
        padlock_rand_status,    /* rand status */
 };
 
-#endif /* COMPILE_HW_PADLOCK */
+#else  /* !COMPILE_HW_PADLOCK */
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
+OPENSSL_EXPORT
+int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
+IMPLEMENT_DYNAMIC_CHECK_FN()
+#endif
 
 #endif /* !OPENSSL_NO_HW_PADLOCK */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/makeengines.com b/engines/makeengines.com
index 42b0ae050d8e94a82858c1d19a8350382b313b17..a1806c82ae6edc617717094d77469bd0bfe65118 100644 (file)
--- a/engines/makeengines.com
+++ b/engines/makeengines.com
@@ -1,5 +1,5 @@
 $!
-$!  MAKEAPPS.COM
+$!  MAKEENGINES.COM
 $!  Written By:  Richard Levitte
 $!               richard@levitte.org
 $!
@@ -203,6 +203,10 @@ $!
 $ FILE_DONE:
 $ CLOSE OBJECTS
 $!
+$! Do not link the support files.
+$!
+$ IF ENGINE_NAME .EQS. "" THEN GOTO ENGINE_DONE
+$!
 $! Now, there are two ways to handle this.  We can either build 
 $! shareable images or stick the engine object file into libcrypto.
 $! For now, the latter is NOT supported.