diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2006-09-29 13:46:41 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2006-09-29 13:46:41 +0000 |
| commit | 6e0d32a061299ebcecd3bac5ac34e09fc82a7367 (patch) | |
| tree | ffe25e3f1b2717afa9ca266aa6e2e2f29fc998eb | |
| parent | 10d388c0e86f2da7cd5222fc968a1c0ea5586e55 (diff) | |
Correct problem in the 2006-09-28 patch concerning the handling of
excessively large DH moduli.
Reported by: Steve Kiernan (Juniper SIRT)
Security: FreeBSD-SA-06:23.openssl
Approved by: so (cperciva)
Notes
svn path=/releng/5.5/; revision=162788
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/dh/dh_key.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20060929: p7 FreeBSD-SA-06:23.openssl + Correct problem in the 2006-09-28 patch concerning the handling of + excessively large DH moduli. + 20060928: p6 FreeBSD-SA-06:23.openssl Correct multiple vulnerabilities in crypto(3). Limit the size of public keys used in order to protect applications diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/openssl/crypto/dh/dh_key.c index f735fa78f1a5..51bfc76ca418 100644 --- a/crypto/openssl/crypto/dh/dh_key.c +++ b/crypto/openssl/crypto/dh/dh_key.c @@ -167,7 +167,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { DHerr(DH_F_DH_COMPUTE_KEY,DH_R_MODULUS_TOO_LARGE); - goto err; + return -1; } ctx = BN_CTX_new(); diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 71fea7bbc831..8321a34ae9ee 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="5.5" -BRANCH="RELEASE-p6" +BRANCH="RELEASE-p7" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" |