Changeset 808 for openssl/trunk/engines/e_padlock.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• engines/e_padlock.c (modified) (3 diffs)

openssl/trunk/engines/e_padlock.c ¶

@@ -109 +109 @@
 #endif
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
+
 void ENGINE_load_padlock (void)
 {
@@ -120 +122 @@
 #endif
 }
+
+#endif
 
 #ifdef COMPILE_HW_PADLOCK
@@ -1219 +1223 @@
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 OPENSSL_EXPORT
+int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
+OPENSSL_EXPORT
 int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
 IMPLEMENT_DYNAMIC_CHECK_FN()