CVS commit: [netbsd-6-0] src/external/bsd/bind

2015-11-15 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Sun Nov 15 19:12:53 UTC 2015

Modified Files:
src/external/bsd/bind/dist [netbsd-6-0]: CHANGES COPYRIGHT FAQ.xml
README config.h.in config.h.win32 configure configure.in srcid
version
src/external/bsd/bind/dist/bin/check [netbsd-6-0]: named-checkconf.c
src/external/bsd/bind/dist/bin/dig [netbsd-6-0]: dig.1 dig.docbook
dig.html dighost.c host.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig [netbsd-6-0]: dig.h
src/external/bsd/bind/dist/bin/dnssec [netbsd-6-0]: dnssec-dsfromkey.c
dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.8
dnssec-keygen.c dnssec-keygen.docbook dnssec-keygen.html
dnssec-settime.8 dnssec-settime.c dnssec-settime.docbook
dnssec-settime.html dnssec-signzone.c dnssec-verify.c dnssectool.c
dnssectool.h
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: client.c config.c
interfacemgr.c main.c named.html query.c server.c update.c
zoneconf.c
src/external/bsd/bind/dist/bin/named/include/named [netbsd-6-0]:
globals.h
src/external/bsd/bind/dist/bin/nsupdate [netbsd-6-0]: nsupdate.c
src/external/bsd/bind/dist/bin/rndc [netbsd-6-0]: rndc.c
src/external/bsd/bind/dist/bin/tests/system [netbsd-6-0]: conf.sh.in
genzone.sh start.pl
src/external/bsd/bind/dist/bin/tests/system/checkconf [netbsd-6-0]:
good.conf tests.sh
src/external/bsd/bind/dist/bin/tests/system/checkzone [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns2 [netbsd-6-0]:
example.db.in sign.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns3 [netbsd-6-0]:
named.conf sign.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones [netbsd-6-0]:
clean.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones/ns1 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/forward [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/forward/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/forward/ns4 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/inline [netbsd-6-0]:
clean.sh setup.sh
src/external/bsd/bind/dist/bin/tests/system/inline/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/notify [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/notify/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/redirect [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver/ns4 [netbsd-6-0]:
root.db tld1.db tld2.db
src/external/bsd/bind/dist/bin/tests/system/resolver/ns7 [netbsd-6-0]:
named1.conf named2.conf
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-6-0]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns1 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns3 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/views [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/views/ns2 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/xfer [netbsd-6-0]:
dig1.good dig2.good
src/external/bsd/bind/dist/contrib/dlz/example [netbsd-6-0]: README
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt [netbsd-6-0]:
README.md
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt/testing 
[netbsd-6-0]:
dns-data.txt
src/external/bsd/bind/dist/contrib/sdb/ldap [netbsd-6-0]: ldapdb.c
src/external/bsd/bind/dist/doc/arm [netbsd-6-0]: Bv9ARM-book.xml
Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html
Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html
Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Makefile.in
dnssec.xml latex-fixup.pl man.arpaname.html man.ddns-confgen.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man

CVS commit: [netbsd-6-0] src/external/bsd/bind

2015-11-17 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 19:31:17 UTC 2015

Modified Files:
src/external/bsd/bind/dist [netbsd-6-0]: CHANGES COPYRIGHT FAQ.xml
README config.h.in config.h.win32 configure configure.in srcid
version
src/external/bsd/bind/dist/bin/check [netbsd-6-0]: named-checkconf.c
src/external/bsd/bind/dist/bin/dig [netbsd-6-0]: dig.1 dig.docbook
dig.html dighost.c host.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig [netbsd-6-0]: dig.h
src/external/bsd/bind/dist/bin/dnssec [netbsd-6-0]: dnssec-dsfromkey.c
dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.8
dnssec-keygen.c dnssec-keygen.docbook dnssec-keygen.html
dnssec-settime.8 dnssec-settime.c dnssec-settime.docbook
dnssec-settime.html dnssec-signzone.c dnssec-verify.c dnssectool.c
dnssectool.h
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: client.c config.c
interfacemgr.c main.c named.html query.c server.c update.c
zoneconf.c
src/external/bsd/bind/dist/bin/named/include/named [netbsd-6-0]:
globals.h
src/external/bsd/bind/dist/bin/nsupdate [netbsd-6-0]: nsupdate.c
src/external/bsd/bind/dist/bin/rndc [netbsd-6-0]: rndc.c
src/external/bsd/bind/dist/bin/tests/system [netbsd-6-0]: conf.sh.in
genzone.sh start.pl
src/external/bsd/bind/dist/bin/tests/system/checkconf [netbsd-6-0]:
good.conf tests.sh
src/external/bsd/bind/dist/bin/tests/system/checkzone [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns2 [netbsd-6-0]:
example.db.in sign.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns3 [netbsd-6-0]:
named.conf sign.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones [netbsd-6-0]:
clean.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones/ns1 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/forward [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/forward/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/forward/ns4 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/inline [netbsd-6-0]:
clean.sh setup.sh
src/external/bsd/bind/dist/bin/tests/system/inline/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/notify [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/notify/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/redirect [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver/ns4 [netbsd-6-0]:
root.db tld1.db tld2.db
src/external/bsd/bind/dist/bin/tests/system/resolver/ns7 [netbsd-6-0]:
named1.conf named2.conf
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-6-0]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns1 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns3 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/views [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/views/ns2 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/xfer [netbsd-6-0]:
dig1.good dig2.good
src/external/bsd/bind/dist/contrib/dlz/example [netbsd-6-0]: README
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt [netbsd-6-0]:
README.md
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt/testing 
[netbsd-6-0]:
dns-data.txt
src/external/bsd/bind/dist/contrib/sdb/ldap [netbsd-6-0]: ldapdb.c
src/external/bsd/bind/dist/doc/arm [netbsd-6-0]: Bv9ARM-book.xml
Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html
Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html
Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Makefile.in
dnssec.xml latex-fixup.pl man.arpaname.html man.ddns-confgen.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man

CVS commit: [netbsd-6-0] src/external/bsd/bind

2015-01-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Jan  4 14:58:28 UTC 2015

Modified Files:
src/external/bsd/bind [netbsd-6-0]: Makefile.inc

Log Message:
Pullup part of rev 1.16 via patch, requested by he in #1226


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.4.1 -r1.12.4.1.4.2 src/external/bsd/bind/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.12.4.1.4.1 src/external/bsd/bind/Makefile.inc:1.12.4.1.4.2
--- src/external/bsd/bind/Makefile.inc:1.12.4.1.4.1	Wed Dec 31 11:58:26 2014
+++ src/external/bsd/bind/Makefile.inc	Sun Jan  4 14:58:28 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.12.4.1.4.1 2014/12/31 11:58:26 msaitoh Exp $
+#	$NetBSD: Makefile.inc,v 1.12.4.1.4.2 2015/01/04 14:58:28 martin Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -108,8 +108,8 @@ LIBDPLIBS+= $L ${NETBSDSRCDIR}/crypt
 .endif
 .endif
 .if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto
-DPADD+= ${LIBCRYPTO}
+LDADD+= -lcrypto -lcrypt
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
 .else
 .if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
 LIBDPLIBS+=	crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto



CVS commit: [netbsd-6-0] src/external/bsd/bind/dist

2012-12-13 Thread Jeff Rizzo
Module Name:src
Committed By:   riz
Date:   Thu Dec 13 17:42:04 UTC 2012

Modified Files:
src/external/bsd/bind/dist [netbsd-6-0]: CHANGES version
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: query.c

Log Message:
external/bsd/bind/dist/CHANGES  patch
external/bsd/bind/dist/version  patch
external/bsd/bind/dist/bin/named/query.cpatch

Address CVE-2012-5688: Named could die on specific queries with dns64
enabled.
[spz, ticket #740]


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.4 -r1.2.2.4.2.1 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.1.1.10.4.4 -r1.1.1.10.4.4.2.1 \
src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7.2.2 -r1.7.2.2.2.1 \
src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.2.2.4 src/external/bsd/bind/dist/CHANGES:1.2.2.4.2.1
--- src/external/bsd/bind/dist/CHANGES:1.2.2.4	Tue Oct  9 23:58:08 2012
+++ src/external/bsd/bind/dist/CHANGES	Thu Dec 13 17:42:04 2012
@@ -1,3 +1,8 @@
+	--- diff from 9.9.2 to 9.9.2-P1 --
+
+3407.  [security]  Named could die on specific queries with dns64 enabled.
+   [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
 	--- 9.9.1-P4 released ---
 
 3383.	[security]	A certain combination of records in the RBT could

Index: src/external/bsd/bind/dist/version
diff -u src/external/bsd/bind/dist/version:1.1.1.10.4.4 src/external/bsd/bind/dist/version:1.1.1.10.4.4.2.1
--- src/external/bsd/bind/dist/version:1.1.1.10.4.4	Tue Oct  9 23:58:08 2012
+++ src/external/bsd/bind/dist/version	Thu Dec 13 17:42:04 2012
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=1
 RELEASETYPE=-P
-RELEASEVER=4
+RELEASEVER=4nb1

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2 src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.1
--- src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2	Tue Oct  9 23:58:09 2012
+++ src/external/bsd/bind/dist/bin/named/query.c	Thu Dec 13 17:42:04 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.7.2.2 2012/10/09 23:58:09 riz Exp $	*/
+/*	$NetBSD: query.c,v 1.7.2.2.2.1 2012/12/13 17:42:04 riz Exp $	*/
 
 /*
  * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
@@ -5178,10 +5178,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t 
 	isc_result_t result;
 	isc_uint32_t ttl = ISC_UINT32_MAX;
 
+	dns_rdataset_init(&rdataset);
+
 	result = dns_db_getoriginnode(db, &node);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
-	dns_rdataset_init(&rdataset);
+
 	result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa,
  0, 0, &rdataset, NULL);
 	if (result != ISC_R_SUCCESS)



CVS commit: [netbsd-6-0] src/external/bsd/bind/include/isc

2015-01-05 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon Jan  5 23:09:44 UTC 2015

Modified Files:
src/external/bsd/bind/include/isc [netbsd-6-0]: platform.h

Log Message:
Pullup the following revision (requested by he in ticket #1217):

src/external/bsd/bind/include/isc/platform.hrev. 1.18

What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit
atomic adds, and I beleive all our platforms can do that.  Therefore,
no need to conditionalize that definition under __HAVE_ATOMIC64_OPS.


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.4.1 -r1.12.4.1.4.2 \
src/external/bsd/bind/include/isc/platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.1 src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.2
--- src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.1	Wed Dec 31 11:59:14 2014
+++ src/external/bsd/bind/include/isc/platform.h	Mon Jan  5 23:09:44 2015
@@ -270,9 +270,7 @@
  * If the "xadd" operation is available on this architecture,
  * ISC_PLATFORM_HAVEXADD will be defined.
  */
-#ifdef __HAVE_ATOMIC64_OPS
 #define ISC_PLATFORM_HAVEXADD 1
-#endif
 
 /*
  * If the "xaddq" operation (64bit xadd) is available on this architecture,



CVS commit: [netbsd-6-0] src/external/bsd/bind/dist/bin/named

2014-01-15 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Wed Jan 15 10:06:57 UTC 2014

Modified Files:
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: query.c

Log Message:
Pull up following revision(s) (requested by spz in ticket #1016):
external/bsd/bind/dist/bin/named/query.c: revision 1.13 via patch
a fix by ISC for CVE-2014-0591:
3693.  [security]  memcpy was incorrectly called with overlapping
   ranges resulting in malformed names being generated
   on some platforms.  This could cause INSIST failures
   when serving NSEC3 signed zones.  [RT #35120]


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.2.2.1 -r1.7.2.2.2.2 \
src/external/bsd/bind/dist/bin/named/query.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.1 src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.2
--- src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.1	Thu Dec 13 17:42:04 2012
+++ src/external/bsd/bind/dist/bin/named/query.c	Wed Jan 15 10:06:57 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: query.c,v 1.7.2.2.2.1 2012/12/13 17:42:04 riz Exp $	*/
+/*	$NetBSD: query.c,v 1.7.2.2.2.2 2014/01/15 10:06:57 bouyer Exp $	*/
 
 /*
  * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
@@ -5079,8 +5079,7 @@ query_findclosestnsec3(dns_name_t *qname
 	dns_fixedname_t fixed;
 	dns_hash_t hash;
 	dns_name_t name;
-	int order;
-	unsigned int count;
+	unsigned int skip = 0, labels;
 	dns_rdata_nsec3_t nsec3;
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	isc_boolean_t optout;
@@ -5095,6 +5094,7 @@ query_findclosestnsec3(dns_name_t *qname
 
 	dns_name_init(&name, NULL);
 	dns_name_clone(qname, &name);
+	labels = dns_name_countlabels(&name);
 	dns_clientinfomethods_init(&cm, ns_client_sourceip);
 	dns_clientinfo_init(&ci, client);
 
@@ -5128,13 +5128,14 @@ query_findclosestnsec3(dns_name_t *qname
 		dns_rdata_reset(&rdata);
 		optout = ISC_TF((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) != 0);
 		if (found != NULL && optout &&
-		dns_name_fullcompare(&name, dns_db_origin(db), &order,
-	 &count) == dns_namereln_subdomain) {
+		dns_name_issubdomain(&name, dns_db_origin(db)))
+		{
 			dns_rdataset_disassociate(rdataset);
 			if (dns_rdataset_isassociated(sigrdataset))
 dns_rdataset_disassociate(sigrdataset);
-			count = dns_name_countlabels(&name) - 1;
-			dns_name_getlabelsequence(&name, 1, count, &name);
+			skip++;
+			dns_name_getlabelsequence(qname, skip, labels - skip,
+			  &name);
 			ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
   NS_LOGMODULE_QUERY, ISC_LOG_DEBUG(3),
   "looking for closest provable encloser");
@@ -5152,7 +5153,11 @@ query_findclosestnsec3(dns_name_t *qname
 		ns_client_log(client, DNS_LOGCATEGORY_DNSSEC,
 			  NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
 			  "expected covering NSEC3, got an exact match");
-	if (found != NULL)
+	if (found == qname) {
+		if (skip != 0U)
+			dns_name_getlabelsequence(qname, skip, labels - skip,
+			  found);
+	} else if (found != NULL)
 		dns_name_copy(&name, found, NULL);
 	return;
 }



CVS commit: [netbsd-6-0] src/external/bsd/bind/dist/lib/dns/rdata/generic

2013-07-28 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon Jul 29 02:07:37 UTC 2013

Modified Files:
src/external/bsd/bind/dist/lib/dns/rdata/generic [netbsd-6-0]:
keydata_65533.c

Log Message:
Patch for bind CVE-2013-4854.


To generate a diff of this commit:
cvs rdiff -u -r1.3.4.1 -r1.3.4.1.4.1 \
src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c
diff -u src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c:1.3.4.1 src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c:1.3.4.1.4.1
--- src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c:1.3.4.1	Tue Jun  5 21:15:11 2012
+++ src/external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c	Mon Jul 29 02:07:37 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: keydata_65533.c,v 1.3.4.1 2012/06/05 21:15:11 bouyer Exp $	*/
+/*	$NetBSD: keydata_65533.c,v 1.3.4.1.4.1 2013/07/29 02:07:37 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
@@ -196,7 +196,7 @@ fromwire_keydata(ARGS_FROMWIRE) {
 	UNUSED(options);
 
 	isc_buffer_activeregion(source, &sr);
-	if (sr.length < 4)
+	if (sr.length < 16)
 		return (ISC_R_UNEXPECTEDEND);
 
 	isc_buffer_forward(source, sr.length);