corrected includes

diff --git a/TODO b/TODO
index ab9bc2c7087b0996c73817047841ddc576b67b51..98b2de90f3d715592a29ff8ec2702532ecfabb76 100644 (file)
--- a/TODO
+++ b/TODO
@@ -38,6 +38,7 @@ o Remove/Handle all XXX and TODO/todos'
   - data.c/data.h      - dname.c
   - packet.c (partially)
 o conversion from  ldns_key to key rr's
+o init function? random - load_ssl_errors()
 
 Documentation:
 --------------

diff --git a/dnssec.c b/dnssec.c
index 562351a7d0500c149a47ec46be4a1c0bbfab1c1b..5b20946e0ef6386c0c0e5221fb3fba84793a78a5 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -845,6 +845,9 @@ ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)
                (void)ldns_rr_rrsig_set_labels(current_sig, 
                                ldns_native2rdf_int8(LDNS_RDF_TYPE_INT8, ldns_rr_label_count(
                                                ldns_rr_list_rr(rrset_clone, 0))));
+               printf("label cnt %d\n",
+                               ldns_rr_label_count(ldns_rr_list_rr(rrset_clone, 0)));
+               
                /* inception, expiration */
                (void)ldns_rr_rrsig_set_inception(current_sig,
                                ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, ldns_key_inception(current_key)));

diff --git a/keys.c b/keys.c
index da29a1ef899f951bf0ba28b641f3bf551c12e16f..c7287e0708bf108078db3088af01954a408d1f26 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -10,10 +10,9 @@
 #include <openssl/ssl.h>
 
 #include <util.h>
+#include <ldns/dnssec.h>
 #include <ldns/keys.h>
 
-
-
 ldns_lookup_table ldns_signing_algorithms[] = {
         { LDNS_SIGN_RSAMD5, "RSAMD5" },
         { LDNS_SIGN_RSASHA1, "RSASHA1" },

diff --git a/ldns/dnssec.h b/ldns/dnssec.h
index f90aff7df2d514b8f7fba36fdef3345f3f08f1d3..b8f6f843e15e9926b97ba51a43ec8985c4e27a34 100644 (file)
--- a/ldns/dnssec.h
+++ b/ldns/dnssec.h
@@ -11,15 +11,17 @@
 #ifndef _DNSSEC_H_
 #define _DNSSEC_H_
 
+#include <openssl/ssl.h>
 #include <ldns/common.h>
 #include <ldns/dns.h>
 #include <ldns/buffer.h>
 #include <ldns/packet.h>
-#include <openssl/ssl.h>
+#include <ldns/keys.h>
 
 #define MAX_KEYLEN     2048
 #define DNSSEC_KEYPROTO        3
 
+#if 0
 /**
  * algorigthms used in dns
  */
@@ -35,6 +37,7 @@ enum ldns_enum_algorithm
        LDNS_PRIVATEOID         = 254
 };
 typedef enum ldns_enum_algorithm ldns_algorithm;
+#endif
 
 /** 
  * Calculates a keytag of a key for use in DNSSEC
@@ -101,8 +104,7 @@ ldns_status ldns_pkt_tsig_sign(ldns_pkt *pkt, const char *key_name, const char *
  */
 ldns_rr *ldns_key_rr2ds(const ldns_rr *key);
 
-ldns_rr_list *ldns_sign(ldns_rr_list*, ldns_rr_list*);
-
+ldns_rr_list * ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys);
 ldns_rdf *ldns_sign_public_dsa(ldns_buffer *to_sign, DSA *key);
 ldns_rdf *ldns_sign_public_rsamd5(ldns_buffer *to_sign, RSA *key);
 ldns_rdf *ldns_sign_public_rsasha1(ldns_buffer *to_sign, RSA *key);

diff --git a/ldns/keys.h b/ldns/keys.h
index 1c2d68b5d882d3302624eaebecd8e7550f062fed..e1ee955e100a2ef4edce63b5b46d413c2c3440c1 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -20,6 +20,22 @@
 
 extern ldns_lookup_table ldns_signing_algorithms[];
 
+/**
+ * algorigthms used in dns
+ */
+enum ldns_enum_algorithm
+{
+        LDNS_RSAMD5             = 1,
+        LDNS_DH                 = 2,
+        LDNS_DSA                = 3,
+        LDNS_ECC                = 4,
+        LDNS_RSASHA1            = 5,
+        LDNS_INDIRECT           = 252,
+        LDNS_PRIVATEDNS         = 253,
+        LDNS_PRIVATEOID         = 254
+};
+typedef enum ldns_enum_algorithm ldns_algorithm;
+
 enum ldns_enum_signing_algorithm
 {
        LDNS_SIGN_RSAMD5         = LDNS_RSAMD5,

diff --git a/net.c b/net.c
index 53aa0370f4d32f81e5398ffc243ec5ad6c2a91c2..d1d9241dea7d63aee7d99802a7c77c3505d46100 100644 (file)
--- a/net.c
+++ b/net.c
@@ -13,15 +13,8 @@
 
 #include <config.h>
 
-#include <ldns/rdata.h>
-#include <ldns/error.h>
-#include <ldns/resolver.h>
-#include <ldns/buffer.h>
-#include <ldns/wire2host.h>
-#include <ldns/host2wire.h>
-#include <ldns/host2str.h>
-#include <ldns/resolver.h>
-#include <ldns/net.h>
+#include <ldns/ldns.h>
+
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/resolver.c b/resolver.c
index 4b677b59bfca39fff5e639c46a573c950a2be789..f13ecaf34f5a898e92ac08fd51cf0c6fc11bb171 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -13,14 +13,7 @@
 #include <config.h>
 #include <stdio.h>
 
-#include <ldns/rdata.h>
-#include <ldns/error.h>
-#include <ldns/resolver.h>
-#include <ldns/rdata.h>
-#include <ldns/net.h>
-#include <ldns/host2str.h>
-#include <ldns/dns.h>
-#include <ldns/dname.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 

diff --git a/run-test18.c b/run-test18.c
index ee34d366896e90971373ff50c1bc47d7e4b8da08..62c4c88a3144de702f714111d6911e767b501d6c 100644 (file)
--- a/run-test18.c
+++ b/run-test18.c
@@ -49,7 +49,7 @@ main()
 
        ldns_key_set_origttl(privkey, 1800);
        ldns_key_set_origttl(privkey_dsa, 1800);
-       SSL_load_error_strings();
+       /*      SSL_load_error_strings();*/
 
        ldns_key_list_push_key(keys, privkey);
        ldns_key_list_push_key(keys, privkey_dsa);
@@ -77,18 +77,14 @@ main()
                exit(1);
        }
        ldns_rr_list_push_rr(dnskeys, dnskey);
-       ldns_rr_list_push_rr(dnskeys, dnskey_dsa);
+       /* only rsa for now */
+/*     ldns_rr_list_push_rr(dnskeys, dnskey_dsa); */
 
        signatures = ldns_sign_public(rrs, keys);
-               printf("\n");
 
        ldns_rr_list_print(stdout, signatures);
 
        printf("Now we are going to verify\n");
-       ldns_rdf_print(stdout, ldns_rr_rdf(
-                       ldns_rr_list_rr(signatures, 0),
-                       8));
-       printf("\n");
 
        printf("\n[%d]\n", ldns_verify(rrs, signatures, dnskeys));