Accept v1.x Private-key-format.

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 8e492dae7b2768344395d57da85f6983c1045036..637f05f8ceb65fae5b2a7f7620e84777bb3bffe4 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -980,7 +980,7 @@ ldns_dnssec_derive_trust_tree_ds_rrset(ldns_dnssec_trust_tree *new_tree,
                                        ldns_dnssec_data_chain *data_chain,
                                        ldns_rr *cur_rr)
 {
-       return ldns_dnssec_derive_trust_tree_ds_rrset_time(
+       ldns_dnssec_derive_trust_tree_ds_rrset_time(
                        new_tree, data_chain, cur_rr, ldns_time(NULL));
 }
 
@@ -1039,7 +1039,7 @@ void
 ldns_dnssec_derive_trust_tree_no_sig(ldns_dnssec_trust_tree *new_tree,
                                      ldns_dnssec_data_chain *data_chain)
 {
-       return ldns_dnssec_derive_trust_tree_no_sig_time(
+       ldns_dnssec_derive_trust_tree_no_sig_time(
                        new_tree, data_chain, ldns_time(NULL));
 }
 

diff --git a/keys.c b/keys.c
index 2d7f62ab1f4903ccc6848ee0be320e1e5a7008cc..3772122afddd7dc56b9fdf34ef7b5fce95dcfd7e 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -314,7 +314,7 @@ ldns_key_new_frm_fp_l(ldns_key **key, FILE *fp, int *line_nr)
 
        /* the file is highly structured. Do this in sequence */
        /* RSA:
-        * Private-key-format: v1.2
+        * Private-key-format: v1.x.
         * Algorithm: 1 (RSA)
 
         */
@@ -326,7 +326,7 @@ ldns_key_new_frm_fp_l(ldns_key **key, FILE *fp, int *line_nr)
                 LDNS_FREE(d);
                return LDNS_STATUS_SYNTAX_ERR;
        }
-       if (strncmp(d, "v1.2", strlen(d)) != 0) {
+       if (strncmp(d, "v1.", 3) != 0) {
                 ldns_key_free(k);
                 LDNS_FREE(d);
                return LDNS_STATUS_SYNTAX_VERSION_ERR;

diff --git a/ldns/keys.h b/ldns/keys.h
index ae5d47417c535f9a737cb8638d7b1b5063ce1e31..ad3ff25bb8de86be3cc73c0c22bcbb6a6c0109e3 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -200,7 +200,7 @@ ldns_key *ldns_key_new_frm_algorithm(ldns_signing_algorithm a, uint16_t size);
  * Creates a new priv key based on the 
  * contents of the file pointed by fp.
  *
- * The file should be in Private-key-format v1.2.
+ * The file should be in Private-key-format v1.x.
  *
  * \param[out] k the new ldns_key structure
  * \param[in] fp the file pointer to use
@@ -212,7 +212,7 @@ ldns_status ldns_key_new_frm_fp(ldns_key **k, FILE *fp);
  * Creates a new private key based on the 
  * contents of the file pointed by fp
  *
- * The file should be in Private-key-format v1.2.
+ * The file should be in Private-key-format v1.x.
  *
  * \param[out] k the new ldns_key structure
  * \param[in] fp the file pointer to use