d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from vendor/bind9/dist as of the 9.4.3-P1 import

Browse Source
This commit is contained in:
Doug Barton 2009-01-09 11:45:45 +00:00
commit 990eddd5b7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=186942
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/bind9/CHANGES
View File

@ -1,3 +1,11 @@
--- 9.4.3-P1 released ---
2522. [security] Handle -1 from DSA_do_verify().
2498. [bug] Removed a bogus function argument used with
ISC_SOCKET_USE_POLLWATCH: it could cause compiler
warning or crash named with the debug 1 level
of logging. [RT #18917]
--- 9.4.3 released ---

2
contrib/bind9/lib/dns/api
View File

@ -1,3 +1,3 @@
LIBINTERFACE = 36
LIBREVISION = 1
LIBREVISION = 2
LIBAGE = 0

4
contrib/bind9/lib/dns/openssldsa_link.c
View File

@ -16,7 +16,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: openssldsa_link.c,v 1.1.6.9 2007/08/28 07:20:04 tbox Exp $ */
/* $Id: openssldsa_link.c,v 1.1.6.9.28.1 2008/12/24 00:21:22 marka Exp $ */
#ifdef OPENSSL
@ -133,7 +133,7 @@ openssldsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
status = DSA_do_verify(digest, ISC_SHA1_DIGESTLENGTH, dsasig, dsa);
DSA_SIG_free(dsasig);
if (status == 0)
if (status != 1)
return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
return (ISC_R_SUCCESS);

4
contrib/bind9/lib/dns/opensslrsa_link.c
View File

@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $
* $Id: opensslrsa_link.c,v 1.1.6.11.58.1 2008/12/24 00:21:22 marka Exp $
*/
#ifdef OPENSSL
@ -246,7 +246,7 @@ opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) {
status = RSA_verify(type, digest, digestlen, sig->base,
RSA_size(rsa), rsa);
if (status == 0)
if (status != 1)
return (dst__openssl_toresult(DST_R_VERIFYFAILURE));
return (ISC_R_SUCCESS);

7
contrib/bind9/lib/isc/unix/socket.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */
/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */
/*! \file */
@ -501,7 +501,7 @@ FIX_IPV6_RECVPKTINFO(isc_socket_t *sock)
if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
(void *)&on, sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_RECVPKTINFO) "
"%s: %s", sock->fd,
@ -3163,7 +3163,6 @@ watcher(void *uap) {
ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_SOCKET,
ISC_LOG_DEBUG(1),
ISC_LOG_INFO,
"unexpected POLL timeout");
}
pollstate = poll_active;
@ -4902,7 +4901,7 @@ isc_socket_ipv6only(isc_socket_t *sock, isc_boolean_t yes) {
if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
(void *)&onoff, sizeof(int)) < 0) {
char strbuf[ISC_STRERRORSIZE];
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_V6ONLY) "
"%s: %s", sock->fd,

6
contrib/bind9/version
View File

@ -1,4 +1,4 @@
# $Id: version,v 1.29.134.23 2008/11/12 04:17:12 marka Exp $
# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=4
PATCHVER=3
RELEASETYPE=
RELEASEVER=
RELEASETYPE=-P
RELEASEVER=1