From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 19 Feb 2016 12:17:03 +0000 (+0000)
Subject: - load gost algorithm if digest is seen before key algorithm.
X-Git-Tag: release-1.5.8~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f954b82890429e1dc3227becef809090ce27ec;p=thirdparty%2Funbound.git

- load gost algorithm if digest is seen before key algorithm.


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

diff --git a/doc/Changelog b/doc/Changelog
index 5f02a2b05..596f80169 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,6 @@
 19 February 2016: Wouter
 	- Print understandable debug log when unusable DS record is seen.
-	- load gost algorithm into unbound-host.
+	- load gost algorithm if digest is seen before key algorithm.
 
 17 February 2016: Wouter
 	- Fix that "make install" fails due to "text file busy" error.
diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
index b256a3226..30fef51fd 100644
--- a/smallapp/unbound-host.c
+++ b/smallapp/unbound-host.c
@@ -418,9 +418,6 @@ int main(int argc, char* argv[])
 	struct ub_ctx* ctx = NULL;
 	int debuglevel = 0;
 	
-#  ifdef USE_GOST
-	(void)sldns_key_EVP_load_gost_id();
-#  endif
 	ctx = ub_ctx_create();
 	if(!ctx) {
 		fprintf(stderr, "error: out of memory\n");
diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index 7c8d7b287..baa4dae1a 100644
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -117,6 +117,8 @@ ds_digest_size_supported(int algo)
 #endif
 #ifdef USE_GOST
 		case LDNS_HASH_GOST:
+			/* we support GOST if it can be loaded */
+			(void)sldns_key_EVP_load_gost_id();
 			if(EVP_get_digestbyname("md_gost94"))
 				return 32;
 			else	return 0;