* ldns-signzone checks if public key file is for the right zone.

diff --git a/Changelog b/Changelog
index 8179e3d2ca1c89c307dfdf35441c78f3253f66ed..bceb008f12a851b1bce555e366533bab4062332c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,7 @@
        * Fix crash using GOST for particular platform configurations.
        * extern C declarations used in the header file.
        * Removed debug fprintf from resolver.c.
+       * ldns-signzone checks if public key file is for the right zone.
 
 1.6.5
        * Catch \X where X is a digit as an error.

diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 86584d37c54920c1e7447947750427d17cb56aac..39b63603a564bf499be4fbf1435d627c06df94a4 100644 (file)
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -266,6 +266,11 @@ find_or_create_pubkey(const char *keyfile_name_base, ldns_key *key, ldns_zone *o
                                ldns_key_set_keytag(key, ldns_key_keytag(key) - 1);
                        }
                }
+               if(pubkey && ldns_dname_compare(ldns_rr_owner(pubkey), ldns_rr_owner(ldns_zone_soa(orig_zone))) != 0) {
+                       fprintf(stderr, "Error %s.key has wrong name: %s\n",
+                               keyfile_name_base, ldns_rdf2str(ldns_rr_owner(pubkey)));
+                       exit(EXIT_FAILURE); /* leak rdf2str, but we exit */
+               }
        }
        
        if (!pubkey) {