almost there (I think)

diff --git a/dnssec.c b/dnssec.c
index c94439bdd3ee200708cabfdd580baed47ea4eed4..fcc41d732cb737eb738685b0ad8941c62bcb2a6f 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -750,9 +750,10 @@ ldns_sign_shared(void)
 
 /**
  * use this function to sign with a public/private key alg
+ * return the created signatures
  */
-ldns_status
-/*ldns_sign_public(ldns_rr_list *rrset, ldns_)*/
+ldns_rr_list *
+/*ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)*/
 ldns_sign_public(void)
 {
        return LDNS_STATUS_OK;

diff --git a/keys.c b/keys.c
index 008d48030449eb9a2636033f233ea40c429d96b4..ef60f74af02d96114340d2a77b53f142b4a4622c 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -12,6 +12,16 @@
 
 #include <util.h>
 
+
+ldns_lookup_table ldns_signing_algorithms[] = {
+        { LDNS_SIGN_ALG_RSAMD5, "RSAMD5" },
+        { LDNS_SIGN_ALG_RSASHA1, "RSASHA1" },
+        { LDNS_SIGN_ALG_DSAMD5, "DSAMD5" },
+        { LDNS_SIGN_ALG_DSASHA1, "DSASHA1" },
+        { LDNS_SIGN_ALG_HMACMD5, "hmac-md5.sig-alg.reg.int" },
+        { 0, NULL }
+};
+
 ldns_key_list *
 ldns_key_list_new()
 {
@@ -74,5 +84,3 @@ ldns_key_list_push_key(ldns_key_list *key_list, ldns_key *key)
         ldns_key_list_set_key_count(key_list, key_count + 1);
         return true;
 }
-
-

diff --git a/ldns/keys.h b/ldns/keys.h
index ff08c04ae4afc9eee92f4dc2d018231c863c2b54..e858a9083179a4dde5367db1ee74eb81a5183631 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -27,17 +27,10 @@ enum ldns_enum_signing_algorithm
 };
 typedef enum ldns_enum_signing_algorithm ldns_signing_algorithm;
 
-ldns_lookup_table ldns_signing_algorithms[] = {
-       { LDNS_SIGN_ALG_RSAMD5, "RSAMD5" },
-       { LDNS_SIGN_ALG_RSASHA1, "RSASHA1" },
-       { LDNS_SIGN_ALG_DSAMD5, "DSAMD5" },
-       { LDNS_SIGN_ALG_DSASHA1, "DSASHA1" },
-       { LDNS_SIGN_ALG_HMACMD5, "hmac-md5.sig-alg.reg.int" },
-       { 0, NULL }
-};
+extern ldns_lookup_table ldns_signing_algorithms[];
 
 struct ldns_struct_key {
-       ldns_signing_algorithm algorithm;
+       ldns_signing_algorithm alg;
        /* types of keys supported */
        union {
                RSA     *rsa;

diff --git a/ldns/ldns.h b/ldns/ldns.h
index b0dc87fc654477624ab1fea42f55813b979b35f9..f24f6d840c39aea08ddc12a38ecede1f9720be15 100644 (file)
--- a/ldns/ldns.h
+++ b/ldns/ldns.h
@@ -23,5 +23,6 @@
 #include <ldns/resolver.h>
 #include <ldns/dns.h>
 #include <ldns/net.h>
+#include <ldns/keys.h>
 
 #endif /* _LDNS_H */