diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-01-13 21:19:27 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-01-13 21:19:27 +0000 |
| commit | a5718404886956d936e753a6a5a314eefbf064eb (patch) | |
| tree | d9ad1e09c38fd46ff21ac0ab1318a681cef290be | |
| parent | 636b4dcc16aaafd36ca1dec5ff590cd41b16adcf (diff) | |
Notes
| -rw-r--r-- | UPDATING | 6 | ||||
| -rw-r--r-- | contrib/bind9/lib/dns/openssldsa_link.c | 2 | ||||
| -rw-r--r-- | contrib/bind9/lib/dns/opensslrsa_link.c | 2 | ||||
| -rw-r--r-- | contrib/ntp/ntpd/ntp_crypto.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
5 files changed, 10 insertions, 4 deletions
@@ -8,6 +8,12 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20090113: p9 FreeBSD-SA-09:03.ntpd, FreeBSD-SA-09:04.bind + Correct ntpd cryptographic signature bypass. [09:03] + + Correct BIND DNSSEC incorrect checks for malformed + signatures. [09:04] + 20090107: p8 FreeBSD-SA-09:01.lukemftpd, FreeBSD-SA-09:02.openssl Prevent cross-site forgery attacks on lukemftpd(8) due to splitting long commands into multiple requests. [09:01] diff --git a/contrib/bind9/lib/dns/openssldsa_link.c b/contrib/bind9/lib/dns/openssldsa_link.c index d2b083377338..660a8ed28502 100644 --- a/contrib/bind9/lib/dns/openssldsa_link.c +++ b/contrib/bind9/lib/dns/openssldsa_link.c @@ -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); diff --git a/contrib/bind9/lib/dns/opensslrsa_link.c b/contrib/bind9/lib/dns/opensslrsa_link.c index 2609df6e7067..bfe21b4362f4 100644 --- a/contrib/bind9/lib/dns/opensslrsa_link.c +++ b/contrib/bind9/lib/dns/opensslrsa_link.c @@ -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); diff --git a/contrib/ntp/ntpd/ntp_crypto.c b/contrib/ntp/ntpd/ntp_crypto.c index 3e677032a164..3820bd395457 100644 --- a/contrib/ntp/ntpd/ntp_crypto.c +++ b/contrib/ntp/ntpd/ntp_crypto.c @@ -1536,7 +1536,7 @@ crypto_verify( EVP_VerifyUpdate(&ctx, (u_char *)&ep->tstamp, vallen + 12); if (EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, - pkey)) { + pkey) == 1) { if (peer->crypto & CRYPTO_FLAG_VRFY) peer->crypto |= CRYPTO_FLAG_PROV; } else { diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6d9318c67f6c..a65223c29994 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.0" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |