port.

git-svn-id: file:///svn/unbound/trunk@603 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 63b3854d585aefd5b6a1b1399eda4096952df61e..78c87efbb7c81274b0a33d2769dbea4efd57e12c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 6 September 2007: Wouter
        - fixup to find libevent on mac port install.
+       - fixup size_t vs unsigned portability in validator/sigcrypt.
 
 5 September 2007: Wouter
        - cname, name error validator tests.

diff --git a/testdata/val_cnametodnametocnametopos.rpl b/testdata/val_cnametodnametocnametopos.rpl
index 0a54c298270c84ae856ec4d2881f584272ca4a43..f3f530cfb8b9723010c6ee3c5f16268156603c86 100644 (file)
--- a/testdata/val_cnametodnametocnametopos.rpl
+++ b/testdata/val_cnametodnametocnametopos.rpl
@@ -139,7 +139,7 @@ SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
 
-; response for delagation to sub.example.com.
+; response for delegation to sub.example.com.
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_secds.rpl b/testdata/val_secds.rpl
index 479aa3d60981b0ddf36fffae7f58ed986d48e652..b244396cf07b1f1d86348c5cb90bbd5bcf549eed 100644 (file)
--- a/testdata/val_secds.rpl
+++ b/testdata/val_secds.rpl
@@ -77,7 +77,7 @@ ns.example.com.               IN      A       1.2.3.4
 ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
 ENTRY_END
 
-; response for delagation to sub.example.com.
+; response for delegation to sub.example.com.
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c
index cfa57a77fb9e12cba2eb965d72ea91b222a95a00..3b9c2d8e226cd21dcf549b50b60969c4a215588b 100644 (file)
--- a/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@ -164,7 +164,7 @@ dnskey_get_algo(struct ub_packed_rrset_key* k, size_t idx)
 /** get public key rdata field from a dnskey RR and do some checks */
 static void
 dnskey_get_pubkey(struct ub_packed_rrset_key* k, size_t idx,
-       unsigned char** pk, size_t* pklen)
+       unsigned char** pk, unsigned int* pklen)
 {
        uint8_t* rdata;
        size_t len;
@@ -175,7 +175,7 @@ dnskey_get_pubkey(struct ub_packed_rrset_key* k, size_t idx,
                return;
        }
        *pk = (unsigned char*)rdata+2+4;
-       *pklen = len-2-4;
+       *pklen = (unsigned)len-2-4;
 }
 
 int