Remove unused LDNS_RDF_TYPE_TSIG

and associated functions.

diff --git a/Changelog b/Changelog
index 549020512388cfe088034e7ce56b1ee62bcb82b8..2821668e81d4d28fa8702b88d50a44b5dc7f56a6 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -45,6 +45,7 @@
          ldns 1.7.0 will have shared library version (SONAME) 2.0.0
        * bugfix #521: drill trace continue on empty non-terminals with NSEC3
        * bugfix #525: Fix documentation of ldns_resolver_set_retry
+       * Remove unused LDNS_RDF_TYPE_TSIG and associated functions.
 
 1.6.16 2012-11-13
        * Fix Makefile to build pyldns with BSD make

diff --git a/contrib/python/docs/source/modules/ldns_rdf.rst b/contrib/python/docs/source/modules/ldns_rdf.rst
index 5ed1799b1bb176451f75238d62c8f0277c68e44e..4a482e444398401ba16cd0917d86c7172da6796b 100644 (file)
--- a/contrib/python/docs/source/modules/ldns_rdf.rst
+++ b/contrib/python/docs/source/modules/ldns_rdf.rst
@@ -35,7 +35,7 @@ Predefined constants
        * LDNS_RDF_TYPE_TIME,
        * LDNS_RDF_TYPE_PERIOD,
        * LDNS_RDF_TYPE_TSIGTIME,
-       * LDNS_RDF_TYPE_TSIG,
+       * LDNS_RDF_TYPE_HIP,
        * LDNS_RDF_TYPE_INT16_DATA,
        * LDNS_RDF_TYPE_SERVICE,
        * LDNS_RDF_TYPE_LOC,

diff --git a/contrib/python/ldns_rdf.i b/contrib/python/ldns_rdf.i
index 9bd327274af255be2b1f169178c4b77c9d5eb97f..7b69d8b2176874033b0274d5cdad0275bf867345 100644 (file)
--- a/contrib/python/ldns_rdf.i
+++ b/contrib/python/ldns_rdf.i
@@ -205,7 +205,7 @@
                        case LDNS_RDF_TYPE_TIME:       return "TIME";
                        case LDNS_RDF_TYPE_PERIOD:     return "PERIOD";
                        case LDNS_RDF_TYPE_TSIGTIME:   return "TSIGTIME";
-                       case LDNS_RDF_TYPE_TSIG:       return "TSIG";
+                       case LDNS_RDF_TYPE_HIP:        return "HIP";
                        case LDNS_RDF_TYPE_INT16_DATA: return "INT16_DATA";
                        case LDNS_RDF_TYPE_SERVICE:    return "SERVICE";
                        case LDNS_RDF_TYPE_LOC:        return "LOC";

diff --git a/host2str.c b/host2str.c
index 798a049f4034b436d6aa250a51456a44caa861ac..d28da4b0d4c6997149d85a97a0a55ad02e51fd02 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1159,13 +1159,6 @@ ldns_rdf2buffer_str_ipseckey(ldns_buffer *output, const ldns_rdf *rdf)
        return ldns_buffer_status(output);
 }
 
-ldns_status
-ldns_rdf2buffer_str_tsig(ldns_buffer *output, const ldns_rdf *rdf)
-{
-       /* TSIG RRs have no presentation format, make them #size <data> */
-       return ldns_rdf2buffer_str_unknown(output, rdf);
-}
-
 ldns_status
 ldns_rdf2buffer_str_ilnp64(ldns_buffer *output, const ldns_rdf *rdf)
 {
@@ -1334,9 +1327,6 @@ ldns_rdf2buffer_str_fmt(ldns_buffer *buffer,
                case LDNS_RDF_TYPE_IPSECKEY:
                        res = ldns_rdf2buffer_str_ipseckey(buffer, rdf);
                        break;
-               case LDNS_RDF_TYPE_TSIG:
-                       res = ldns_rdf2buffer_str_tsig(buffer, rdf);
-                       break;
                case LDNS_RDF_TYPE_INT16_DATA:
                        res = ldns_rdf2buffer_str_int16_data(buffer, rdf);
                        break;

diff --git a/ldns/host2str.h b/ldns/host2str.h
index 0a020ed5be065e403364059200e1a69a3ec23857..18e3d15f6fc393c278bd2b9340d372bd294eb6a2 100644 (file)
--- a/ldns/host2str.h
+++ b/ldns/host2str.h
@@ -466,15 +466,6 @@ ldns_status ldns_rdf2buffer_str_int16_data(ldns_buffer *output, const ldns_rdf *
  */
 ldns_status ldns_rdf2buffer_str_ipseckey(ldns_buffer *output, const ldns_rdf *rdf);
 
-/** 
- * Converts an LDNS_RDF_TYPE_TSIG rdata element to string format and adds it to the output buffer 
- * \param[in] *rdf The rdata to convert
- * \param[in] *output The buffer to add the data to
- * \return LDNS_STATUS_OK on success, and error status on failure
- */
-ldns_status ldns_rdf2buffer_str_tsig(ldns_buffer *output, const ldns_rdf *rdf);
-
-
 /**
  * Converts the data in the rdata field to presentation
  * format (as char *) and appends it to the given buffer

diff --git a/ldns/rdata.h b/ldns/rdata.h
index 1d86b0fcea0313e7561d4453b59f2a276231a735..7a9afb45186a18842309f1e102c197f6a462f741 100644 (file)
--- a/ldns/rdata.h
+++ b/ldns/rdata.h
@@ -86,7 +86,10 @@ enum ldns_enum_rdf_type
        LDNS_RDF_TYPE_PERIOD,
        /** tsig time 48 bits */
        LDNS_RDF_TYPE_TSIGTIME,
-       LDNS_RDF_TYPE_TSIG,
+       /** Represents the Public Key Algorithm, HIT and Public Key fields
+           for the HIP RR types.  A HIP specific rdf type is used because of
+           the unusual layout in wireformat (see RFC 5205 Section 5) */
+       LDNS_RDF_TYPE_HIP,
        /** variable length any type rdata where the length
            is specified by the first 2 bytes */
        LDNS_RDF_TYPE_INT16_DATA,

diff --git a/ldns/str2host.h b/ldns/str2host.h
index b8371f7cacfa061edcaa7cc60ddfd74edae7cd3f..6dbf68a5f4b411c0cd65b2e5889fb16b2a1fb922 100644 (file)
--- a/ldns/str2host.h
+++ b/ldns/str2host.h
@@ -180,14 +180,6 @@ ldns_status ldns_str2rdf_alg(ldns_rdf **rd, const char *str);
  */
 ldns_status ldns_str2rdf_unknown(ldns_rdf **rd, const char *str);
 
-/**
- * convert string with a tsig? RR into wireformat
- * \param[in] rd the rdf where to put the data
- * \param[in] str the string to be converted
- * \return ldns_status
- */
-ldns_status ldns_str2rdf_tsig(ldns_rdf **rd, const char *str);
-
 /**
  * convert string with a protocol service into wireformat
  * \param[in] rd the rdf where to put the data

diff --git a/lua/rns-lib.lua b/lua/rns-lib.lua
index b6e910c0e3ea2bf93d62cd5a33c778fed722b7eb..c32568a5c2e6b779aceb1cfd1f172174526bf5f1 100644 (file)
--- a/lua/rns-lib.lua
+++ b/lua/rns-lib.lua
@@ -16,24 +16,26 @@ LDNS_RDF_TYPE_A                     = 5
 LDNS_RDF_TYPE_AAAA             = 6
 LDNS_RDF_TYPE_STR              = 7
 LDNS_RDF_TYPE_APL              = 8
-LDNS_RDF_TYPE_B64              = 9
-LDNS_RDF_TYPE_HEX              = 10
-LDNS_RDF_TYPE_NSEC             = 11
-LDNS_RDF_TYPE_TYPE             = 12
-LDNS_RDF_TYPE_CLASS            = 13
-LDNS_RDF_TYPE_CERT             = 14
-LDNS_RDF_TYPE_ALG              = 15
-LDNS_RDF_TYPE_UNKNOWN          = 16
-LDNS_RDF_TYPE_TIME             = 17
-LDNS_RDF_TYPE_PERIOD           = 18
-LDNS_RDF_TYPE_TSIGTIME         = 19
-LDNS_RDF_TYPE_TSIG             = 20
-LDNS_RDF_TYPE_INT16_DATA       = 21
-LDNS_RDF_TYPE_SERVICE          = 22
-LDNS_RDF_TYPE_LOC              = 23
-LDNS_RDF_TYPE_WKS              = 24
-LDNS_RDF_TYPE_NSA              = 25
-LDNS_RDF_TYPE_IPSECKEY         = 26
+LDNS_RDF_TYPE_B32_EXT          = 9
+LDNS_RDF_TYPE_B64              = 10
+LDNS_RDF_TYPE_HEX              = 11
+LDNS_RDF_TYPE_NSEC             = 12
+LDNS_RDF_TYPE_TYPE             = 13
+LDNS_RDF_TYPE_CLASS            = 14
+LDNS_RDF_TYPE_CERT             = 15
+LDNS_RDF_TYPE_ALG              = 16
+LDNS_RDF_TYPE_UNKNOWN          = 17
+LDNS_RDF_TYPE_TIME             = 18
+LDNS_RDF_TYPE_PERIOD           = 19
+LDNS_RDF_TYPE_TSIGTIME         = 20
+LDNS_RDF_TYPE_HIP              = 21
+LDNS_RDF_TYPE_INT16_DATA       = 22
+LDNS_RDF_TYPE_SERVICE          = 23
+LDNS_RDF_TYPE_LOC              = 24
+LDNS_RDF_TYPE_WKS              = 25
+LDNS_RDF_TYPE_NSAP             = 26
+LDNS_RDF_TYPE_ATMA             = 27
+LDNS_RDF_TYPE_IPSECKEY         = 28
 
 function lua_debug(...)
        print("[lua]", unpack(arg))

diff --git a/rdata.c b/rdata.c
index 5b53c4a980d6222cced1f421c3cac9905af574a4..9b3236dbaa54d75eb94a4d3fb541bbcae7953d47 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -309,9 +309,6 @@ ldns_rdf_new_frm_str(ldns_rdf_type type, const char *str)
        case LDNS_RDF_TYPE_PERIOD:
                status = ldns_str2rdf_period(&rdf, str);
                break;
-       case LDNS_RDF_TYPE_TSIG:
-               status = ldns_str2rdf_tsig(&rdf, str);
-               break;
        case LDNS_RDF_TYPE_SERVICE:
                status = ldns_str2rdf_service(&rdf, str);
                break;

diff --git a/str2host.c b/str2host.c
index 623f06dd4e499c3ca61f4c06c74b9bb06f0be75d..3c2f95847e22f35ec207973018f526fe24a592d3 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -812,15 +812,6 @@ ldns_str2rdf_unknown( ATTR_UNUSED(ldns_rdf **rd)
        return LDNS_STATUS_NOT_IMPL;
 }
 
-ldns_status
-ldns_str2rdf_tsig( ATTR_UNUSED(ldns_rdf **rd)
-                , ATTR_UNUSED(const char *str)
-                )
-{
-       /* there is no string representation for TSIG rrs */
-       return LDNS_STATUS_NOT_IMPL;
-}
-
 ldns_status
 ldns_str2rdf_service( ATTR_UNUSED(ldns_rdf **rd)
                    , ATTR_UNUSED(const char *str)

diff --git a/wire2host.c b/wire2host.c
index 02be4917d6ef274a95334f81d59c3890b83ffec1..40484c0719e1ae183d3908dde59fec74baf71142 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -333,7 +333,6 @@ ldns_wire2rdf(ldns_rr *rr, const uint8_t *wire, size_t max, size_t *pos)
                case LDNS_RDF_TYPE_NSAP:
                case LDNS_RDF_TYPE_ATMA:
                case LDNS_RDF_TYPE_IPSECKEY:
-               case LDNS_RDF_TYPE_TSIG:
                case LDNS_RDF_TYPE_LONG_STR:
                case LDNS_RDF_TYPE_NONE:
                        /*