upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup for defines not funcs

Browse source 
git-svn-id: file:///svn/unbound/trunk@3845 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-09-02 11:20:21 +00:00
parent 3514843818
commit 7ef6c46aaf
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -673,7 +673,7 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h],,, [AC_INCLUDES_DEFAULT]) AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h],,, [AC_INCLUDES_DEFAULT])
AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests EVP_cleanup ERR_load_crypto_strings OpenSSL_add_all_algorithms SSL_library_init CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup]) AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup])
AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [ AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [
AC_INCLUDES_DEFAULT AC_INCLUDES_DEFAULT
#ifdef HAVE_OPENSSL_ERR_H #ifdef HAVE_OPENSSL_ERR_H

4
daemon/daemon.c
View file

@ -211,7 +211,7 @@ daemon_init(void)
# ifdef USE_GOST # ifdef USE_GOST
(void)sldns_key_EVP_load_gost_id(); (void)sldns_key_EVP_load_gost_id();
# endif # endif
# ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS # if OPENSSL_VERSION_NUMBER < 0x10100000
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
# else # else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
@ -222,7 +222,7 @@ daemon_init(void)
/* grab the COMP method ptr because openssl leaks it */ /* grab the COMP method ptr because openssl leaks it */
comp_meth = (void*)SSL_COMP_get_compression_methods(); comp_meth = (void*)SSL_COMP_get_compression_methods();
# endif # endif
# ifdef HAVE_SSL_LIBRARY_INIT # if OPENSSL_VERSION_NUMBER < 0x10100000
(void)SSL_library_init(); (void)SSL_library_init();
# else # else
(void)OPENSSL_init_ssl(0, NULL); (void)OPENSSL_init_ssl(0, NULL);

4
smallapp/unbound-anchor.c
View file

@ -2315,14 +2315,14 @@ int main(int argc, char* argv[])
ERR_load_crypto_strings(); ERR_load_crypto_strings();
#endif #endif
ERR_load_SSL_strings(); ERR_load_SSL_strings();
#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS #if OPENSSL_VERSION_NUMBER < 0x10100000
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#else #else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
| OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ADD_ALL_DIGESTS
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
#endif #endif
#ifdef HAVE_SSL_LIBRARY_INIT #if OPENSSL_VERSION_NUMBER < 0x10100000
(void)SSL_library_init(); (void)SSL_library_init();
#else #else
(void)OPENSSL_init_ssl(0, NULL); (void)OPENSSL_init_ssl(0, NULL);

4
smallapp/unbound-control.c
View file

@ -422,14 +422,14 @@ int main(int argc, char* argv[])
ERR_load_crypto_strings(); ERR_load_crypto_strings();
#endif #endif
ERR_load_SSL_strings(); ERR_load_SSL_strings();
#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS #if OPENSSL_VERSION_NUMBER < 0x10100000
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#else #else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
| OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ADD_ALL_DIGESTS
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
#endif #endif
#ifdef HAVE_SSL_LIBRARY_INIT #if OPENSSL_VERSION_NUMBER < 0x10100000
(void)SSL_library_init(); (void)SSL_library_init();
#else #else
(void)OPENSSL_init_ssl(0, NULL); (void)OPENSSL_init_ssl(0, NULL);

4
testcode/petal.c
View file

@ -638,14 +638,14 @@ int main(int argc, char* argv[])
ERR_load_crypto_strings(); ERR_load_crypto_strings();
#endif #endif
ERR_load_SSL_strings(); ERR_load_SSL_strings();
#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS #if OPENSSL_VERSION_NUMBER < 0x10100000
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#else #else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
| OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ADD_ALL_DIGESTS
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
#endif #endif
#ifdef HAVE_SSL_LIBRARY_INIT #if OPENSSL_VERSION_NUMBER < 0x10100000
(void)SSL_library_init(); (void)SSL_library_init();
#else #else
(void)OPENSSL_init_ssl(0, NULL); (void)OPENSSL_init_ssl(0, NULL);

4
testcode/streamtcp.c
View file

@ -406,14 +406,14 @@ int main(int argc, char** argv)
} }
if(usessl) { if(usessl) {
ERR_load_SSL_strings(); ERR_load_SSL_strings();
#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS #if OPENSSL_VERSION_NUMBER < 0x10100000
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#else #else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
| OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ADD_ALL_DIGESTS
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
#endif #endif
#ifdef HAVE_SSL_LIBRARY_INIT #if OPENSSL_VERSION_NUMBER < 0x10100000
(void)SSL_library_init(); (void)SSL_library_init();
#else #else
(void)OPENSSL_init_ssl(0, NULL); (void)OPENSSL_init_ssl(0, NULL);