From ced7835c06b507528a27a1ef54de7f2533a2200c Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Sat, 28 May 2011 00:21:28 +0000
Subject: Upgrade to 9.6-ESV-R4-P1, which address the following issues:

1. Very large RRSIG RRsets included in a negative cache can trigger
an assertion failure that will crash named (BIND 9 DNS) due to an
off-by-one error in a buffer size check.

This bug affects all resolving name servers, whether DNSSEC validation
is enabled or not, on all BIND versions prior to today. There is a
possibility of malicious exploitation of this bug by remote users.

2. Named could fail to validate zones listed in a DLV that validated
insecure without using DLV and had DS records in the parent zone.

Add a patch provided by ru@ and confirmed by ISC to fix a crash at
shutdown time when a SIG(0) key is being used.
---
 contrib/bind9/lib/isccc/Makefile.in               | 2 +-
 contrib/bind9/lib/isccc/alist.c                   | 2 +-
 contrib/bind9/lib/isccc/base64.c                  | 2 +-
 contrib/bind9/lib/isccc/cc.c                      | 2 +-
 contrib/bind9/lib/isccc/ccmsg.c                   | 2 +-
 contrib/bind9/lib/isccc/include/Makefile.in       | 2 +-
 contrib/bind9/lib/isccc/include/isccc/Makefile.in | 2 +-
 contrib/bind9/lib/isccc/include/isccc/alist.h     | 2 +-
 contrib/bind9/lib/isccc/include/isccc/base64.h    | 2 +-
 contrib/bind9/lib/isccc/include/isccc/cc.h        | 2 +-
 contrib/bind9/lib/isccc/include/isccc/ccmsg.h     | 2 +-
 contrib/bind9/lib/isccc/include/isccc/events.h    | 2 +-
 contrib/bind9/lib/isccc/include/isccc/lib.h       | 2 +-
 contrib/bind9/lib/isccc/include/isccc/result.h    | 2 +-
 contrib/bind9/lib/isccc/include/isccc/sexpr.h     | 2 +-
 contrib/bind9/lib/isccc/include/isccc/symtab.h    | 2 +-
 contrib/bind9/lib/isccc/include/isccc/symtype.h   | 2 +-
 contrib/bind9/lib/isccc/include/isccc/types.h     | 2 +-
 contrib/bind9/lib/isccc/include/isccc/util.h      | 2 +-
 contrib/bind9/lib/isccc/include/isccc/version.h   | 2 +-
 contrib/bind9/lib/isccc/lib.c                     | 2 +-
 contrib/bind9/lib/isccc/result.c                  | 2 +-
 contrib/bind9/lib/isccc/sexpr.c                   | 2 +-
 contrib/bind9/lib/isccc/symtab.c                  | 2 +-
 contrib/bind9/lib/isccc/version.c                 | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'contrib/bind9/lib/isccc')

diff --git a/contrib/bind9/lib/isccc/Makefile.in b/contrib/bind9/lib/isccc/Makefile.in
index 5dcc225..fb08fcd 100644
--- a/contrib/bind9/lib/isccc/Makefile.in
+++ b/contrib/bind9/lib/isccc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2007/06/19 23:47:21 tbox Exp $
+# $Id: Makefile.in,v 1.9 2007-06-19 23:47:21 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/contrib/bind9/lib/isccc/alist.c b/contrib/bind9/lib/isccc/alist.c
index 4f1743e..a4a912e 100644
--- a/contrib/bind9/lib/isccc/alist.c
+++ b/contrib/bind9/lib/isccc/alist.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: alist.c,v 1.8 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/base64.c b/contrib/bind9/lib/isccc/base64.c
index 78b34ed..6c1a7bf 100644
--- a/contrib/bind9/lib/isccc/base64.c
+++ b/contrib/bind9/lib/isccc/base64.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: base64.c,v 1.8 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/cc.c b/contrib/bind9/lib/isccc/cc.c
index cfa1db6..9f5a60c 100644
--- a/contrib/bind9/lib/isccc/cc.c
+++ b/contrib/bind9/lib/isccc/cc.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cc.c,v 1.18 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: cc.c,v 1.18 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/ccmsg.c b/contrib/bind9/lib/isccc/ccmsg.c
index 298fc22..c94d90f 100644
--- a/contrib/bind9/lib/isccc/ccmsg.c
+++ b/contrib/bind9/lib/isccc/ccmsg.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.c,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: ccmsg.c,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/include/Makefile.in b/contrib/bind9/lib/isccc/include/Makefile.in
index 9f727c3..240560f 100644
--- a/contrib/bind9/lib/isccc/include/Makefile.in
+++ b/contrib/bind9/lib/isccc/include/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2007/06/19 23:47:22 tbox Exp $
+# $Id: Makefile.in,v 1.5 2007-06-19 23:47:22 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/contrib/bind9/lib/isccc/include/isccc/Makefile.in b/contrib/bind9/lib/isccc/include/isccc/Makefile.in
index ae5bec7..ba52f3f 100644
--- a/contrib/bind9/lib/isccc/include/isccc/Makefile.in
+++ b/contrib/bind9/lib/isccc/include/isccc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
+# $Id: Makefile.in,v 1.7 2007-06-19 23:47:22 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/contrib/bind9/lib/isccc/include/isccc/alist.h b/contrib/bind9/lib/isccc/include/isccc/alist.h
index 29147a6..54100a3 100644
--- a/contrib/bind9/lib/isccc/include/isccc/alist.h
+++ b/contrib/bind9/lib/isccc/include/isccc/alist.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: alist.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_ALIST_H
 #define ISCCC_ALIST_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/base64.h b/contrib/bind9/lib/isccc/include/isccc/base64.h
index 795b044..f39aef1 100644
--- a/contrib/bind9/lib/isccc/include/isccc/base64.h
+++ b/contrib/bind9/lib/isccc/include/isccc/base64.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: base64.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_BASE64_H
 #define ISCCC_BASE64_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/cc.h b/contrib/bind9/lib/isccc/include/isccc/cc.h
index 79393be..2f72b27 100644
--- a/contrib/bind9/lib/isccc/include/isccc/cc.h
+++ b/contrib/bind9/lib/isccc/include/isccc/cc.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cc.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: cc.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_CC_H
 #define ISCCC_CC_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/ccmsg.h b/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
index e25aa51..8479345 100644
--- a/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
+++ b/contrib/bind9/lib/isccc/include/isccc/ccmsg.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: ccmsg.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_CCMSG_H
 #define ISCCC_CCMSG_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/events.h b/contrib/bind9/lib/isccc/include/isccc/events.h
index a3e1470..bf2c405 100644
--- a/contrib/bind9/lib/isccc/include/isccc/events.h
+++ b/contrib/bind9/lib/isccc/include/isccc/events.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: events.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: events.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_EVENTS_H
 #define ISCCC_EVENTS_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/lib.h b/contrib/bind9/lib/isccc/include/isccc/lib.h
index de74666..6de52ed 100644
--- a/contrib/bind9/lib/isccc/include/isccc/lib.h
+++ b/contrib/bind9/lib/isccc/include/isccc/lib.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: lib.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_LIB_H
 #define ISCCC_LIB_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/result.h b/contrib/bind9/lib/isccc/include/isccc/result.h
index 2d54969..13a09c7 100644
--- a/contrib/bind9/lib/isccc/include/isccc/result.h
+++ b/contrib/bind9/lib/isccc/include/isccc/result.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.12 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: result.h,v 1.12 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_RESULT_H
 #define ISCCC_RESULT_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/sexpr.h b/contrib/bind9/lib/isccc/include/isccc/sexpr.h
index 6112631..e0e5af5 100644
--- a/contrib/bind9/lib/isccc/include/isccc/sexpr.h
+++ b/contrib/bind9/lib/isccc/include/isccc/sexpr.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sexpr.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: sexpr.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SEXPR_H
 #define ISCCC_SEXPR_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/symtab.h b/contrib/bind9/lib/isccc/include/isccc/symtab.h
index 77a188a..031e851 100644
--- a/contrib/bind9/lib/isccc/include/isccc/symtab.h
+++ b/contrib/bind9/lib/isccc/include/isccc/symtab.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: symtab.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SYMTAB_H
 #define ISCCC_SYMTAB_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/symtype.h b/contrib/bind9/lib/isccc/include/isccc/symtype.h
index c8e6868..d007997 100644
--- a/contrib/bind9/lib/isccc/include/isccc/symtype.h
+++ b/contrib/bind9/lib/isccc/include/isccc/symtype.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtype.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: symtype.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SYMTYPE_H
 #define ISCCC_SYMTYPE_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/types.h b/contrib/bind9/lib/isccc/include/isccc/types.h
index fd5c9f3..2ff494c 100644
--- a/contrib/bind9/lib/isccc/include/isccc/types.h
+++ b/contrib/bind9/lib/isccc/include/isccc/types.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: types.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_TYPES_H
 #define ISCCC_TYPES_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/util.h b/contrib/bind9/lib/isccc/include/isccc/util.h
index 2e36b6e..dda3b5e 100644
--- a/contrib/bind9/lib/isccc/include/isccc/util.h
+++ b/contrib/bind9/lib/isccc/include/isccc/util.h
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: util.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_UTIL_H
 #define ISCCC_UTIL_H 1
diff --git a/contrib/bind9/lib/isccc/include/isccc/version.h b/contrib/bind9/lib/isccc/include/isccc/version.h
index 869316c..d352a1b 100644
--- a/contrib/bind9/lib/isccc/include/isccc/version.h
+++ b/contrib/bind9/lib/isccc/include/isccc/version.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
+/* $Id: version.h,v 1.9 2007-06-19 23:47:22 tbox Exp $ */
 
 /*! \file isccc/version.h */
 
diff --git a/contrib/bind9/lib/isccc/lib.c b/contrib/bind9/lib/isccc/lib.c
index 17170f5..43edcf1 100644
--- a/contrib/bind9/lib/isccc/lib.c
+++ b/contrib/bind9/lib/isccc/lib.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.9 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: lib.c,v 1.9 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/result.c b/contrib/bind9/lib/isccc/result.c
index cbedc16..e37fc06 100644
--- a/contrib/bind9/lib/isccc/result.c
+++ b/contrib/bind9/lib/isccc/result.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: result.c,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/sexpr.c b/contrib/bind9/lib/isccc/sexpr.c
index e96536d..0f14ab9 100644
--- a/contrib/bind9/lib/isccc/sexpr.c
+++ b/contrib/bind9/lib/isccc/sexpr.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sexpr.c,v 1.9 2007/08/28 07:20:43 tbox Exp $ */
+/* $Id: sexpr.c,v 1.9 2007-08-28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/symtab.c b/contrib/bind9/lib/isccc/symtab.c
index d7ae687..1fc7b5f 100644
--- a/contrib/bind9/lib/isccc/symtab.c
+++ b/contrib/bind9/lib/isccc/symtab.c
@@ -29,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.11 2007/09/13 04:45:18 each Exp $ */
+/* $Id: symtab.c,v 1.11 2007-09-13 04:45:18 each Exp $ */
 
 /*! \file */
 
diff --git a/contrib/bind9/lib/isccc/version.c b/contrib/bind9/lib/isccc/version.c
index c9d9124..35c4253 100644
--- a/contrib/bind9/lib/isccc/version.c
+++ b/contrib/bind9/lib/isccc/version.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
+/* $Id: version.c,v 1.7 2007-06-19 23:47:22 tbox Exp $ */
 
 /*! \file */
 
-- 
cgit v1.1