]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
PATCH APPLIED: HÃ¥kan Olsson <ho@rfc.se>
authorMiek Gieben <miekg@NLnetLabs.nl>
Tue, 13 Sep 2005 11:58:31 +0000 (11:58 +0000)
committerMiek Gieben <miekg@NLnetLabs.nl>
Tue, 13 Sep 2005 11:58:31 +0000 (11:58 +0000)
don't build tools - ldns-update.c doesn't build yet

Makefile.in
dnssec.c
higher.c
keys.c
ldns/dns.h
ldns/dnssec.h
ldns/higher.h
ldns/keys.h
ldns/packet.h
packet.c
rr.c

index 5b984e279e456f2b99a8f7f051bcd98336243b10..1f8c38da0eed3386a8c2a5e66c15b17c302c4c5d 100644 (file)
@@ -24,9 +24,9 @@ LINTFLAGS     = +quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsign
 INSTALL = $(srcdir)/install-sh 
 
 LIBDNS_SOURCES =       rdata.c util.c rr.c packet.c wire2host.c \
-                       host2str.c buffer.c str2host.c resolver.c \
+                       host2str.c buffer.c str2host.c tsig.c resolver.c \
                        net.c host2wire.c dname.c dnssec.c keys.c \
-                       higher.c rr_functions.c parse.c error.c zone.c
+                       higher.c rr_functions.c parse.c update.c error.c zone.c
 LIBDNS_HEADERS =       ldns/error.h            \
                        ldns/packet.h           \
                        ldns/common.h           \
@@ -47,8 +47,10 @@ LIBDNS_HEADERS       =       ldns/error.h            \
                        ldns/rr_functions.h     \
                        ldns/dns.h              \
                        ldns/zone.h             \
-                       ldns/util.h
-PROG_SOURCES   =       ldns-mx.c ldns-chaos.c ldns-keygen.c ldns-key2ds.c ldns-signzone.c ldns-version.c
+                       ldns/util.h             \
+                       ldns/update.h           \
+                       ldns/tsig.h
+PROG_SOURCES   =       ldns-mx.c ldns-chaos.c ldns-keygen.c ldns-key2ds.c ldns-signzone.c ldns-version.c ldns-update.c
 PROG_TARGETS   =       $(PROG_SOURCES:.c=)
 
 LIBDNS_OBJECTS =       $(LIBDNS_SOURCES:.c=.o)
@@ -69,7 +71,7 @@ LINK_LIB      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
 .PHONY: install-h uninstall-h install-lib uninstall-lib snapshot release
 .PHONY: confdrill tools-drill
 
-all:           lib confdrill tools
+all:           lib confdrill
 
 tools:         $(PROG_TARGETS) confdrill tools-drill
 
index c5e5b0afaa02e87091bfe9f5301df6dc4524f7ff..97e4cbd6946db5c79b26f2519ef04300bd4716d9 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -619,369 +619,6 @@ ldns_key_buf2rsa(ldns_buffer *key)
        return rsa;
 }
 
-/*
- *  Makes an exact copy of the wire, but with the tsig rr removed
- */
-uint8_t *
-ldns_tsig_prepare_pkt_wire(uint8_t *wire, size_t wire_len, size_t *result_len)
-{
-       uint8_t *wire2 = NULL;
-       uint16_t qd_count;
-       uint16_t an_count;
-       uint16_t ns_count;
-       uint16_t ar_count;
-       ldns_rr *rr;
-       
-       size_t pos;
-       uint16_t i;
-       
-       ldns_status status;
-
-       /* fake parse the wire */
-       qd_count = LDNS_QDCOUNT(wire);
-       an_count = LDNS_ANCOUNT(wire);
-       ns_count = LDNS_NSCOUNT(wire);
-       ar_count = LDNS_ARCOUNT(wire);
-       
-       if (ar_count > 0) {
-               ar_count--;
-       } else {
-               return NULL;
-       }
-
-       pos = LDNS_HEADER_SIZE;
-       
-       for (i = 0; i < qd_count; i++) {
-               status = ldns_wire2rr(&rr, wire, wire_len, &pos,
-                                     LDNS_SECTION_QUESTION);
-               if (status != LDNS_STATUS_OK) {
-                       return NULL;
-               }
-               ldns_rr_free(rr);
-       }
-       
-       for (i = 0; i < an_count; i++) {
-               status = ldns_wire2rr(&rr, wire, wire_len, &pos,
-                                     LDNS_SECTION_ANSWER);
-               if (status != LDNS_STATUS_OK) {
-                       return NULL;
-               }
-               ldns_rr_free(rr);
-       }
-       
-       for (i = 0; i < ns_count; i++) {
-               status = ldns_wire2rr(&rr, wire, wire_len, &pos,
-                                     LDNS_SECTION_AUTHORITY);
-               if (status != LDNS_STATUS_OK) {
-                       return NULL;
-               }
-               ldns_rr_free(rr);
-       }
-       
-       for (i = 0; i < ar_count; i++) {
-               status = ldns_wire2rr(&rr, wire, wire_len, &pos,
-                                     LDNS_SECTION_ADDITIONAL);
-               if (status != LDNS_STATUS_OK) {
-                       return NULL;
-               }
-               ldns_rr_free(rr);
-       }
-       
-       *result_len = pos;
-       wire2 = LDNS_XMALLOC(uint8_t, *result_len);
-       memcpy(wire2, wire, *result_len);
-       
-       ldns_write_uint16(wire2 + LDNS_ARCOUNT_OFF, ar_count);
-       
-       return wire2;
-}
-
-const EVP_MD *
-ldns_get_digest_function(char *name)
-{
-       /* TODO replace with openssl's EVP_get_digestbyname
-               (need init somewhere for that)
-               jelte
-               Miek: don't know 
-       */
-       if (strlen(name) == 10 && strncasecmp(name, "hmac-sha1.", 9) == 0) {
-               return EVP_sha1();
-       } else if (strlen(name) == 25 && strncasecmp(name, "hmac-md5.sig-alg.reg.int.", 25) == 0) {
-               return EVP_md5();
-       } else {
-               return NULL;
-       }
-}
-
-ldns_status
-ldns_create_tsig_mac(
-       ldns_rdf **tsig_mac,
-       uint8_t *pkt_wire,
-       size_t pkt_wire_size,
-       const char *key_data,
-       ldns_rdf *key_name_rdf,
-       ldns_rdf *fudge_rdf,
-       ldns_rdf *algorithm_rdf,
-       ldns_rdf *time_signed_rdf,
-       ldns_rdf *error_rdf,
-       ldns_rdf *other_data_rdf,
-       ldns_rdf *orig_mac_rdf
-)
-{
-       ldns_buffer *data_buffer = NULL;
-       char *wireformat;
-       int wiresize;
-       unsigned char *mac_bytes;
-       unsigned int md_len = EVP_MAX_MD_SIZE;
-       unsigned char *key_bytes;
-       int key_size;
-       const EVP_MD *digester;
-       char *algorithm_name;
-       ldns_rdf *result = NULL;
-       
-       /* 
-        * prepare the digestable information
-        */
-       data_buffer = ldns_buffer_new(LDNS_MAX_PACKETLEN);
-       /* if orig_mac is not NULL, add it too */
-       if (orig_mac_rdf) {
-               (void) ldns_rdf2buffer_wire(data_buffer, orig_mac_rdf);
-       }
-       ldns_buffer_write(data_buffer, pkt_wire, pkt_wire_size);
-       (void) ldns_rdf2buffer_wire(data_buffer, key_name_rdf);
-       ldns_buffer_write_u16(data_buffer, LDNS_RR_CLASS_ANY);
-       ldns_buffer_write_u32(data_buffer, 0);
-       (void) ldns_rdf2buffer_wire(data_buffer, algorithm_rdf);
-       (void) ldns_rdf2buffer_wire(data_buffer, time_signed_rdf);
-       (void) ldns_rdf2buffer_wire(data_buffer, fudge_rdf);
-       (void) ldns_rdf2buffer_wire(data_buffer, error_rdf);
-       (void) ldns_rdf2buffer_wire(data_buffer, other_data_rdf);
-       
-       wireformat = (char *) data_buffer->_data;
-       wiresize = (int) ldns_buffer_position(data_buffer);
-       
-       algorithm_name = ldns_rdf2str(algorithm_rdf);
-       
-       /* prepare the key */
-       key_bytes = LDNS_XMALLOC(unsigned char, b64_pton_calculate_size(strlen(key_data)));
-       key_size = b64_pton(key_data, key_bytes, strlen(key_data) * 2);
-       if (key_size < 0) {
-               /* LDNS_STATUS_INVALID_B64 */
-               dprintf("%s\n", "Bad base64 string");
-               return LDNS_STATUS_INVALID_B64;
-       }
-       /* hmac it */
-       /* 2 spare bytes for the length */
-       mac_bytes = LDNS_XMALLOC(unsigned char, md_len);
-       memset(mac_bytes, 0, md_len);
-       
-       digester = ldns_get_digest_function(algorithm_name);
-       
-       if (digester) {
-               (void) HMAC(digester, key_bytes, key_size, (void *)wireformat, wiresize, mac_bytes + 2, &md_len);
-       
-               ldns_write_uint16(mac_bytes, md_len);
-               result = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_INT16_DATA, md_len + 2, mac_bytes);
-       } else {
-               /*dprintf("No digest found for %s\n", algorithm_name);*/
-               return LDNS_STATUS_CRYPTO_UNKNOWN_ALGO;
-       }
-       
-       LDNS_FREE(algorithm_name);
-       LDNS_FREE(mac_bytes);
-       LDNS_FREE(key_bytes);
-       ldns_buffer_free(data_buffer);
-
-       *tsig_mac = result;
-       
-       return LDNS_STATUS_OK;
-}
-
-
-/* THIS FUNC WILL REMOVE TSIG ITSELF */
-bool
-ldns_pkt_tsig_verify(ldns_pkt *pkt, 
-                     uint8_t *wire,
-                     size_t wirelen,
-                     const char *key_name, 
-                     const char *key_data, 
-                     ldns_rdf *orig_mac_rdf)
-{
-       ldns_rdf *fudge_rdf;
-       ldns_rdf *algorithm_rdf;
-       ldns_rdf *time_signed_rdf;
-       ldns_rdf *orig_id_rdf;
-       ldns_rdf *error_rdf;
-       ldns_rdf *other_data_rdf;
-       ldns_rdf *pkt_mac_rdf;
-       ldns_rdf *my_mac_rdf;
-       ldns_rdf *key_name_rdf = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, key_name);
-       uint16_t pkt_id, orig_pkt_id;
-       ldns_status status;
-       
-       uint8_t *prepared_wire = NULL;
-       size_t prepared_wire_size = 0;
-       
-       ldns_rr *orig_tsig = ldns_pkt_tsig(pkt);
-       
-       if (!orig_tsig) {
-               ldns_rdf_deep_free(key_name_rdf);
-               return false;
-       }
-       algorithm_rdf = ldns_rr_rdf(orig_tsig, 0);
-       time_signed_rdf = ldns_rr_rdf(orig_tsig, 1);
-       fudge_rdf = ldns_rr_rdf(orig_tsig, 2);
-       pkt_mac_rdf = ldns_rr_rdf(orig_tsig, 3);
-       orig_id_rdf = ldns_rr_rdf(orig_tsig, 4);
-       error_rdf = ldns_rr_rdf(orig_tsig, 5);
-       other_data_rdf = ldns_rr_rdf(orig_tsig, 6);
-       
-       /* remove temporarily */
-       ldns_pkt_set_tsig(pkt, NULL);
-       /* temporarily change the id to the original id */
-       pkt_id = ldns_pkt_id(pkt);
-       orig_pkt_id = ldns_rdf2native_int16(orig_id_rdf);
-       ldns_pkt_set_id(pkt, orig_pkt_id);
-
-       prepared_wire = ldns_tsig_prepare_pkt_wire(wire, wirelen, &prepared_wire_size);
-       
-       status = ldns_create_tsig_mac(&my_mac_rdf,
-                                     prepared_wire,
-                                     prepared_wire_size,
-                                     key_data, 
-                                     key_name_rdf,
-                                     fudge_rdf,
-                                     algorithm_rdf,
-                                     time_signed_rdf,
-                                     error_rdf,
-                                     other_data_rdf,
-                                     orig_mac_rdf
-                                    );
-       
-       LDNS_FREE(prepared_wire);
-       
-       if (status != LDNS_STATUS_OK) {
-               ldns_rdf_deep_free(key_name_rdf);
-               return false;
-       }
-       /* Put back the values */
-       ldns_pkt_set_tsig(pkt, orig_tsig);
-       ldns_pkt_set_id(pkt, pkt_id);
-       
-       ldns_rdf_deep_free(key_name_rdf);
-       
-       if (ldns_rdf_compare(pkt_mac_rdf, my_mac_rdf) == 0) {
-               ldns_rdf_deep_free(my_mac_rdf);
-               return true;
-       } else {
-               ldns_rdf_deep_free(my_mac_rdf);
-               return false;
-       }
-}
-
-
-
-/* TODO: memory :p */
-ldns_status
-ldns_pkt_tsig_sign(ldns_pkt *pkt, const char *key_name, const char *key_data, uint16_t fudge, const char *algorithm_name, ldns_rdf *query_mac)
-{
-       int key_size = 0;
-       ldns_rr *tsig_rr;
-       ldns_rdf *key_name_rdf = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, key_name);
-       ldns_rdf *fudge_rdf = NULL;
-       ldns_rdf *orig_id_rdf = NULL;
-       ldns_rdf *algorithm_rdf;
-       ldns_rdf *error_rdf = NULL;
-       ldns_rdf *mac_rdf = NULL;
-       ldns_rdf *other_data_rdf = NULL;
-       
-       ldns_status status = LDNS_STATUS_OK;
-       
-       uint8_t *pkt_wire = NULL;
-       size_t pkt_wire_len;
-       
-       struct timeval tv_time_signed;
-       uint8_t *time_signed = NULL;
-       ldns_rdf *time_signed_rdf = NULL;
-       
-       algorithm_rdf = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, algorithm_name);
-
-       /* eww don't have create tsigtime rdf yet :( */
-       /* bleh :p */
-       if (gettimeofday(&tv_time_signed, NULL) == 0) {
-               time_signed = LDNS_XMALLOC(uint8_t, 6);
-               ldns_write_uint64_as_uint48(time_signed, tv_time_signed.tv_sec);
-       } else {
-               status = LDNS_STATUS_INTERNAL_ERR;
-               goto clean;
-       }
-
-       if (key_size < 0) {
-               status = LDNS_STATUS_INVALID_B64;
-               goto clean;
-       }
-
-       time_signed_rdf = ldns_rdf_new(LDNS_RDF_TYPE_TSIGTIME, 6, time_signed);
-       fudge_rdf = ldns_native2rdf_int16(LDNS_RDF_TYPE_INT16, fudge);
-       orig_id_rdf = ldns_native2rdf_int16(LDNS_RDF_TYPE_INT16, ldns_pkt_id(pkt));
-       error_rdf = ldns_native2rdf_int16(LDNS_RDF_TYPE_INT16, 0);
-       other_data_rdf = ldns_native2rdf_int16_data(0, NULL);
-
-       if (ldns_pkt2wire(&pkt_wire, pkt, &pkt_wire_len) != LDNS_STATUS_OK) {
-               status = LDNS_STATUS_ERR;
-               goto clean;
-       }
-
-       status = ldns_create_tsig_mac(&mac_rdf,
-                                     pkt_wire,
-                                     pkt_wire_len,
-                                     key_data,
-                                     key_name_rdf, 
-                                     fudge_rdf, 
-                                     algorithm_rdf,
-                                     time_signed_rdf,
-                                     error_rdf,
-                                     other_data_rdf,
-                                     query_mac
-                                     );
-       
-       if (!mac_rdf) {
-               status = LDNS_STATUS_ERR;
-               goto clean;
-       }
-       
-       LDNS_FREE(pkt_wire);
-       
-       /* Create the TSIG RR */
-       tsig_rr = ldns_rr_new();
-       ldns_rr_set_owner(tsig_rr, key_name_rdf);
-       ldns_rr_set_class(tsig_rr, LDNS_RR_CLASS_ANY);
-       ldns_rr_set_type(tsig_rr, LDNS_RR_TYPE_TSIG);
-       ldns_rr_set_ttl(tsig_rr, 0);
-       
-       ldns_rr_push_rdf(tsig_rr, algorithm_rdf);
-       ldns_rr_push_rdf(tsig_rr, time_signed_rdf);
-       ldns_rr_push_rdf(tsig_rr, fudge_rdf);
-       ldns_rr_push_rdf(tsig_rr, mac_rdf);
-       ldns_rr_push_rdf(tsig_rr, orig_id_rdf);
-       ldns_rr_push_rdf(tsig_rr, error_rdf);
-       ldns_rr_push_rdf(tsig_rr, other_data_rdf);
-       
-       ldns_pkt_set_tsig(pkt, tsig_rr);
-
-       return status;
-
-clean:
-       ldns_rdf_free(key_name_rdf);
-       ldns_rdf_free(algorithm_rdf);
-       ldns_rdf_free(time_signed_rdf);
-       ldns_rdf_free(fudge_rdf);
-       ldns_rdf_free(orig_id_rdf);
-       ldns_rdf_free(error_rdf);
-       ldns_rdf_free(other_data_rdf);
-       return status;
-}
-
 ldns_rr *
 ldns_key_rr2ds(const ldns_rr *key)
 {
index 60da0935e583fe6fdba3e53253473bb243832050..5065fb291863f6a7cc160c3698fd480b84729e99 100644 (file)
--- a/higher.c
+++ b/higher.c
@@ -266,3 +266,116 @@ ldns_getaddrinfo_secure(void)
 {
        return NULL;
 }
+
+/*
+ * Send a "simple" update for an A or an AAAA RR.
+ * \param[in] fqdn the update RR owner
+ * \param[in] zone the zone to update, if set to NULL, try to figure it out
+ * \param[in] ipaddr the address to add, if set to NULL, remove any A/AAAA RRs
+ * \param[in] ttl the update RR TTL
+ * \param[in] tsig_cred credentials for TSIG-protected update messages
+ */
+ldns_status
+ldns_update_send_simple_A(const char *fqdn, const char *zone,
+    const char *ipaddr, u_int16_t ttl, ldns_tsig_credentials *tsig_cred)
+{
+       ldns_resolver   *res;
+       ldns_pkt        *u_pkt = NULL, *r_pkt;
+       ldns_rr_list    *up_rrlist;
+       ldns_rr         *up_rr;
+       ldns_rdf        *zone_rdf;
+       char            *rrstr;
+       u_int32_t       rrstrlen, status = LDNS_STATUS_OK;
+
+       if (!fqdn || strlen(fqdn) == 0)
+               return LDNS_STATUS_ERR;
+
+       /* Create resolver */
+       res = ldns_update_resolver_new(fqdn, zone, LDNS_RR_CLASS_IN, tsig_cred,
+           &zone_rdf);
+       if (!res || !zone_rdf)
+               goto cleanup;
+
+       /* Set up the update section. */
+       up_rrlist = ldns_rr_list_new();
+       if (!up_rrlist)
+               goto cleanup;
+
+       /* Create input for ldns_rr_new_frm_str() */
+       if (ipaddr) {
+               /* We're adding A or AAAA */
+               rrstrlen = strlen(fqdn) + sizeof (" IN AAAA ") +
+                   strlen(ipaddr) + 1;
+               rrstr = (char *)malloc(rrstrlen);
+               if (!rrstr) {
+                       ldns_rr_list_deep_free(up_rrlist);
+                       goto cleanup;
+               }
+               snprintf(rrstr, rrstrlen, "%s IN %s %s", fqdn,
+                   strchr(ipaddr, ':') ? "AAAA" : "A", ipaddr);
+
+               up_rr = ldns_rr_new_frm_str(rrstr, ttl, NULL);
+               if (!up_rr) {
+                       ldns_rr_list_deep_free(up_rrlist);
+                       free(rrstr);
+                       goto cleanup;
+               }
+               free(rrstr);
+               ldns_rr_list_push_rr(up_rrlist, up_rr);
+       } else {
+               /* We're removing A and/or AAAA from 'fqdn'. [RFC2136 2.5.2] */
+               up_rr = ldns_rr_new();
+               ldns_rr_set_owner(up_rr, ldns_dname_new_frm_str(fqdn));
+               ldns_rr_set_ttl(up_rr, 0);
+               ldns_rr_set_class(up_rr, LDNS_RR_CLASS_ANY);
+
+               ldns_rr_set_type(up_rr, LDNS_RR_TYPE_A);
+               ldns_rr_list_push_rr(up_rrlist, ldns_rr_clone(up_rr));
+
+               ldns_rr_set_type(up_rr, LDNS_RR_TYPE_AAAA);
+               ldns_rr_list_push_rr(up_rrlist, up_rr);
+       }
+       
+       /* Create update packet. */
+       u_pkt = ldns_update_pkt_new(zone_rdf, LDNS_RR_CLASS_IN, NULL,
+           up_rrlist, NULL);
+       zone_rdf = NULL;
+       if (!u_pkt) {
+               ldns_rr_list_deep_free(up_rrlist);
+               goto cleanup;
+       }
+       ldns_pkt_set_random_id(u_pkt);
+
+       /* Add TSIG */
+       if (tsig_cred)
+               if (ldns_update_pkt_tsig_add(u_pkt, res) != LDNS_STATUS_OK)
+                       goto cleanup;
+
+       if (ldns_resolver_send_pkt(&r_pkt, res, u_pkt) != LDNS_STATUS_OK)
+               goto cleanup;
+       ldns_pkt_free(u_pkt);
+       if (!r_pkt)
+               goto cleanup;
+
+       if (ldns_pkt_rcode(r_pkt) != 0) {
+               ldns_lookup_table *t = 
+                   ldns_lookup_by_id(ldns_rcodes,
+                       (int)ldns_pkt_rcode(r_pkt));
+               if (t)
+                       dprintf(";; UPDATE response was %s\n", t->name);
+               else
+                       dprintf(";; UPDATE response was (%d)\n",
+                           ldns_pkt_rcode(r_pkt));
+               status = LDNS_STATUS_ERR;
+       }
+       ldns_pkt_free(r_pkt);
+       ldns_resolver_deep_free(res);
+       return status;
+               
+  cleanup:
+       if (res)
+               ldns_resolver_deep_free(res);
+       if (u_pkt)
+               ldns_pkt_free(u_pkt);
+       return LDNS_STATUS_ERR;
+}
diff --git a/keys.c b/keys.c
index 015128628c6bd305f96a9883062685d1dd6d42bd..21a9c8300fafbb20f2d0b1a345ffe9b0db6aef67 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -472,8 +472,6 @@ ldns_key_set_expiration(ldns_key *k, uint32_t e)
        k->_extra.dnssec.expiration = e;
 }
 
-/* todo also for tsig */
-
 void
 ldns_key_set_pubkey_owner(ldns_key *k, ldns_rdf *r)
 {
@@ -557,8 +555,6 @@ ldns_key_keytag(ldns_key *k)
        return k->_extra.dnssec.keytag;
 }
 
-/* todo also for tsig */
-
 ldns_rdf *
 ldns_key_pubkey_owner(ldns_key *k)
 {
index 3078fe24a77bed522d1fd63aaa1492e6fcd9af7b..8f397c8734b23f50c2ed3c8205e9ee0aa0e14ad4 100644 (file)
@@ -31,6 +31,8 @@
 #include <ldns/resolver.h>
 #include <ldns/rr.h>
 #include <ldns/str2host.h>
+#include <ldns/tsig.h>
+#include <ldns/update.h>
 #include <ldns/wire2host.h>
 #include <ldns/rr_functions.h>
 #include <ldns/keys.h>
index dabfc317d4fc4db2c21a8bef4e09fa19d489c90b..a4c21434e55a952fa06f4a25c7b43b76a4bda0ae 100644 (file)
@@ -122,25 +122,6 @@ RSA *ldns_key_buf2rsa(ldns_buffer *key);
  * Packet is still given (and used, but could be constructed from wire)
  * remove that?
  */
-/**
- * verifies the tsig rr for the given packet and key (string?).
- * The wire must be given too because tsig does not sign normalized packets.
- *
- * \return true if tsig is correct, false if not, or if tsig is not set
- */
-bool ldns_pkt_tsig_verify(ldns_pkt *pkt, uint8_t *wire, size_t wire_size, const char *key_name, const char *key_data, ldns_rdf *mac);
-
-/**
- * creates a tsig rr for the given packet and key (string?).
- * \param[in] pkt the packet to sign
- * \param[in] key_name the name of the shared key
- * \param[in] key_data the key in base 64 format
- * \param[in] fudge seconds of error permitted in time signed
- * \param[in] algorithm_name the name of the algorithm used (TODO more than only hmac-md5.sig-alg.reg.int.?)
- * \param[in] query_mac is added to the digest if not NULL (so NULL is for signing queries, not NULL is for signing answers)
- * \return status (OK if success)
- */
-ldns_status ldns_pkt_tsig_sign(ldns_pkt *pkt, const char *key_name, const char *key_data, uint16_t fudge, const char *algorithm_name, ldns_rdf *query_mac);
 
 /** 
  * returns a new DS rr that represents the given key rr.
index 35135a49781ce71d125810cc8d0803f51382cbaf..9e5a2b0280d3d6df266c95fc3207bc825e4fa603 100644 (file)
@@ -18,6 +18,7 @@
 #include <ldns/rdata.h>
 #include <ldns/rr.h>
 #include <ldns/host2str.h>
+#include <ldns/tsig.h>
 
 /**
  * Ask the resolver about name
@@ -85,5 +86,17 @@ uint16_t ldns_getaddrinfo(ldns_resolver *res, ldns_rdf *node, ldns_rr_class c, l
  * 
  */
 ldns_rr_list *ldns_getaddrinfo_secure();
+
+/*
+ * Send a "simple" update for an A or an AAAA RR.
+ * \param[in] fqdn the update RR owner
+ * \param[in] zone the zone to update, if set to NULL, try to figure it out
+ * \param[in] ipaddr the address to add, if set to NULL, remove any A/AAAA RRs
+ * \param[in] ttl the update RR TTL
+ * \param[in] tsig_cred credentials for TSIG-protected update messages
+ */
+ldns_status ldns_update_send_simple_A(const char *fqdn, const char *zone,
+    const char *ipaddr, u_int16_t tll, ldns_tsig_credentials *tsig_cred);
+
 #endif /* _LDNS_HIGHER_H */
 
index 391ec7d7d023cd5041cf78fb15e4fa5ccf12865f..3be1137cd90d9f61650e6934a200fb591f9c0af2 100644 (file)
@@ -71,10 +71,6 @@ struct ldns_struct_key {
                        uint16_t keytag;
                        uint16_t flags;
                }  dnssec;
-               struct {
-                       uint16_t fudge;
-                       char *   name; /* needed? */
-               } tsig;
        } _extra;
        ldns_rdf *_pubkey_owner;
 };
index 7d0c99f20ba495c5359b9ebbc4f1793230aeddff..d7ad7b1da01f480272df16b2d052fc1a8fa56148 100644 (file)
@@ -182,6 +182,7 @@ ldns_rr_list *ldns_pkt_rr_list_by_name_and_type(ldns_pkt *packet, ldns_rdf *owne
 bool ldns_pkt_set_flags(ldns_pkt *pkt, uint16_t flags);
 
 void ldns_pkt_set_id(ldns_pkt *p, uint16_t id);
+void ldns_pkt_set_random_id(ldns_pkt *p);
 void ldns_pkt_set_qr(ldns_pkt *p, bool b);
 void ldns_pkt_set_aa(ldns_pkt *p, bool b);
 void ldns_pkt_set_tc(ldns_pkt *p, bool b);
index db57b9656a418ed59497c252727f676954c72f43..f2f49e0110ed947d85ed2f5abd328dc0b2a3dd50 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -565,6 +565,19 @@ ldns_pkt_set_id(ldns_pkt *packet, uint16_t id)
        packet->_header->_id = id;
 }
 
+void
+ldns_pkt_set_random_id(ldns_pkt *packet)
+{
+#if defined(OpenBSD)
+       ldns_pkt_set_id(packet, (u_int16_t)arc4random());
+#else
+       /* TODO: time is a terrible seed */
+       srandom((unsigned) time(NULL) ^ getpid());
+       ldns_pkt_set_id(packet, (u_int16_t)random());
+#endif
+}
+
+
 void
 ldns_pkt_set_qr(ldns_pkt *packet, bool qr)
 {
diff --git a/rr.c b/rr.c
index 03190369fd46bfe6db9a3fc4afd3d10e8204ebc9..7b7a56a7922ed71fce90d7c944703198fd961036 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -26,7 +26,6 @@ ldns_rr_new(void)
        ldns_rr_set_owner(rr, NULL);
        ldns_rr_set_rd_count(rr, 0);
        rr->_rdata_fields = NULL; 
-       ldns_rr_set_ttl(rr, 0);
        ldns_rr_set_class(rr, LDNS_RR_CLASS_IN);
        ldns_rr_set_ttl(rr, LDNS_DEFAULT_TTL);
         return rr;