From: Richard Levitte <levitte@openssl.org>
Date: Wed, 6 May 2009 14:03:24 +0000 (+0000)
Subject: Select updates from HEAD
X-Git-Tag: OpenSSL_1_0_0-beta3~97
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11f35a036dd805505f2f6bb33bf8c7a3817ce453;p=oweals%2Fopenssl.git

Select updates from HEAD
---

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 64a13e754c..4095513b7a 100644
--- 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 42b0ae050d..a1806c82ae 100644
--- 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.