integrate -P1 patch

This commit is contained in:
Francis Dupont
2009-01-14 17:41:12 +00:00
parent 1ce368824e
commit 0d9aa71b7c
4 changed files with 7 additions and 5 deletions

View File

@@ -7,6 +7,8 @@
2523. [bug] Random type rdata freed by dns_nsec_typepresent().
[RT #19112]
2522. [security] Handle -1 from DSA_do_verify().
2521. [bug] Improve epoll cross compilation support. [RT #19047]
2519. [bug] dig/host with -4 or -6 didn't work if more than two

View File

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

View File

@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: openssldsa_link.c,v 1.11 2007/08/28 07:20:42 tbox Exp $ */
/* $Id: openssldsa_link.c,v 1.11.92.1 2009/01/14 17:41:12 fdupont Exp $ */
#ifdef OPENSSL
@@ -146,7 +146,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);

View File

@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: opensslrsa_link.c,v 1.16 2007/06/19 23:47:16 tbox Exp $
* $Id: opensslrsa_link.c,v 1.16.128.1 2009/01/14 17:41:12 fdupont Exp $
*/
#ifdef OPENSSL
@@ -247,7 +247,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);