Update from 1.0.0-stable.

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index f503595eceb724d9c118657d98162f3064ed7bbf..c795d5c5c417ca24ebdf68343d9a3ce85e8043fd 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -339,9 +339,11 @@ void ENGINE_load_ubsec(void);
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_padlock(void);
 void ENGINE_load_builtin_engines(void);
+#ifdef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_NO_CAPIENG
 void ENGINE_load_capi(void);
 #endif
+#endif
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
  * "registry" handling. */

diff --git a/util/libeay.num b/util/libeay.num
index 74eb337227b2a415a0d401d76036f66e9fe689bf..731ab63ed43f510e46e6d183cfffbee20ed6e80d 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3657,7 +3657,7 @@ ENGINE_set_ld_ssl_clnt_cert_fn          4044      EXIST:VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_function     4045   EXIST:!VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_fn           4045   EXIST:VMS:FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046   EXIST::FUNCTION:ENGINE
-ENGINE_load_capi                        4047   EXIST::FUNCTION:CAPIENG,ENGINE
+ENGINE_load_capi                        4047   EXIST:WIN32:FUNCTION:CAPIENG,ENGINE
 OPENSSL_isservice                       4048   EXIST::FUNCTION:
 FIPS_dsa_sig_decode                     4049   EXIST:OPENSSL_FIPS:FUNCTION:DSA
 EVP_CIPHER_CTX_clear_flags              4050   EXIST::FUNCTION: