From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Wed, 16 Mar 2005 13:41:05 +0000 (+0000)
Subject: almost there (I think)
X-Git-Tag: release-0.50~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1151018ae4432d2e81b65da08a89ba0bf855ec07;p=thirdparty%2Fldns.git

almost there (I think)
---

diff --git a/dnssec.c b/dnssec.c
index c94439bd..fcc41d73 100644
--- 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 008d4803..ef60f74a 100644
--- 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 ff08c04a..e858a908 100644
--- 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 b0dc87fc..f24f6d84 100644
--- 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 */