- ERR_remove_state deprecated since openssl 1.0.0.

git-svn-id: file:///svn/unbound/trunk@3687 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/daemon.c b/daemon/daemon.c
index e763f724edb4f9f83d133f9e9b1e257e302c31b7..adb936a4f303d4d436e9c974481508eade7381b4 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -656,7 +656,6 @@ daemon_delete(struct daemon* daemon)
        CONF_modules_free();
 #  endif
        CRYPTO_cleanup_all_ex_data(); /* safe, no more threads right now */
-       ERR_remove_state(0);
        ERR_free_strings();
        RAND_cleanup();
 #  if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)

diff --git a/doc/Changelog b/doc/Changelog
index a627b143622e1f03ec67d0bd1f2b9ff27462f2df..938c1656bdcdf4c7ff26f336994a136120301faf 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
        - Fix test for openssl to use HMAC_Update for 1.1.0.
        - acx_nlnetlabs.m4 to v33, with HMAC_Update.
        - acx_nlnetlabs.m4 to v34, with -ldl -pthread test for libcrypto.
+       - ERR_remove_state deprecated since openssl 1.0.0.
 
 18 March 2016: Ralph
        - Validate QNAME minimised NXDOMAIN responses.

diff --git a/testcode/petal.c b/testcode/petal.c
index a54181c372f19a45b68b1810173647c166b7ba52..269b109b8f88482506f58f6bc3ed5ed91d0223c2 100644 (file)
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@ -642,7 +642,6 @@ int main(int argc, char* argv[])
        do_service(addr, port, key, cert);
 
        CRYPTO_cleanup_all_ex_data();
-       ERR_remove_state(0);
        ERR_free_strings();
        RAND_cleanup();
        return 0;

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 0b32dcd869037b2547c3cbde70006b067a8f5036..eb83066b8ed25078caf36f2e2528e3dfbc2f8cf8 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -602,7 +602,6 @@ main(int argc, char* argv[])
        CONF_modules_free();
 #  endif
        CRYPTO_cleanup_all_ex_data();
-       ERR_remove_state(0);
        ERR_free_strings();
        RAND_cleanup();
 #elif defined(HAVE_NSS)