提交 586b79d8 编写于 作者: R Richard Levitte 提交者: Matt Caswell

Fix no-dso (shlibloadtest)

Reviewed-by: NMatt Caswell <matt@openssl.org>
上级 f2342b7a
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
/* The test is only currently implemented for DSO_DLFCN and DSO_WIN32 */
#if defined(DSO_DLFCN) || defined(DSO_WIN32)
#define SSL_CTX_NEW "SSL_CTX_new" #define SSL_CTX_NEW "SSL_CTX_new"
#define SSL_CTX_FREE "SSL_CTX_free" #define SSL_CTX_FREE "SSL_CTX_free"
#define TLS_METHOD "TLS_method" #define TLS_METHOD "TLS_method"
...@@ -35,7 +38,6 @@ static SSL_CTX_free_t SSL_CTX_free; ...@@ -35,7 +38,6 @@ static SSL_CTX_free_t SSL_CTX_free;
static ERR_get_error_t ERR_get_error; static ERR_get_error_t ERR_get_error;
static OpenSSL_version_num_t OpenSSL_version_num; static OpenSSL_version_num_t OpenSSL_version_num;
#ifdef DSO_DLFCN #ifdef DSO_DLFCN
# include <dlfcn.h> # include <dlfcn.h>
...@@ -103,9 +105,6 @@ static int shlib_close(SHLIB lib) ...@@ -103,9 +105,6 @@ static int shlib_close(SHLIB lib)
#endif #endif
/* The test is only currently implemented for DSO_DLFCN and DSO_WIN32 */
#if defined(DSO_DLFCN) || defined(DSO_WIN32)
# define CRYPTO_FIRST_OPT "-crypto_first" # define CRYPTO_FIRST_OPT "-crypto_first"
# define SSL_FIRST_OPT "-ssl_first" # define SSL_FIRST_OPT "-ssl_first"
# define JUST_CRYPTO_OPT "-just_crypto" # define JUST_CRYPTO_OPT "-just_crypto"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册