From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 30 Aug 2007 13:38:52 +0000 (+0000)
Subject: crypto cleanups at exit.
X-Git-Tag: release-0.5~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45297772c94ca1cacf31ad2de3e74126984c93d0;p=thirdparty%2Funbound.git

crypto cleanups at exit.


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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0db21b917..6fd1dbc1a 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -460,6 +460,12 @@ daemon_delete(struct daemon* daemon)
 	free(daemon->pidfile);
 	free(daemon->env);
 	free(daemon);
+	/* libcrypto cleanup */
+	/* CONF_modules_unload(1); */
+	EVP_cleanup();
+	/* ENGINE_cleanup(); */
+	CRYPTO_cleanup_all_ex_data(); /* safe, no more threads right now */
+	ERR_remove_state(0);
 	ERR_free_strings();
 	checklock_stop();
 }
diff --git a/daemon/worker.c b/daemon/worker.c
index 4b768dded..b961a1e57 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -114,7 +114,6 @@ void
 worker_mem_report(struct worker* worker, struct serviced_query* cur_serv)
 {
 	/* debug func in validator module */
-	size_t val_kcache_get_mem(void*);
 	size_t total, front, back, mesh, msg, rrset, infra, ac, superac;
 	size_t me, iter, val;
 	int i;
diff --git a/doc/Changelog b/doc/Changelog
index a4dee8686..8afb1a021 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 	- memory accounting fixup for outside network tcp callbacks.
 	- memory accounting for iterator fixed storage.
 	- key cache size and slabs config options.
+	- lib crypto cleanups at exit. 
 
 29 August 2007: Wouter
 	- test tool to sign rrsets for testing validator with.
diff --git a/validator/validator.c b/validator/validator.c
index 15c7ef44f..996e134d1 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1777,7 +1777,8 @@ val_clear(struct module_qstate* qstate, int id)
 /**
  * Debug helper routine that assists worker in determining memory in 
  * use.
- * @param me: mod_env value
+ * @param env: module environment 
+ * @param id: module id.
  * @return memory in use in bytes.
  */
 static size_t