- 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 5f02a2b059b61df5c14c245ffdc405e89abd6617..596f80169c7ab3a39d26a728c7518e13553cc10b 100644 (file)
--- 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 b256a32260775c916d04a934d1e7bd9320273723..30fef51fdc6f575828508b76dd3a1803f3ec9199 100644 (file)
--- 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 7c8d7b2871825f624015d8008bc5a36259edf557..baa4dae1a871d7aee8775a504c3136ca7a63e290 100644 (file)
--- 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;