diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-11-29 20:43:06 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-11-29 20:43:06 +0000 |
| commit | cb122a13fc0100962e6408f199a57056593b91f9 (patch) | |
| tree | 33aaed1704dd5f934b79a1e3cafdf92bb5e07b48 | |
| parent | a4c47c73d26c524f3a4a9fdbfc0bd24ed6dbaa18 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | crypto/openssl/ssl/s3_clnt.c | 1 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20101129: p4 FreeBSD-SA-10:10.openssl + Fix OpenSSL multiple vulnerabilities. + 20100920: p3 FreeBSD-SA-10:08.bzip2 Fix an integer overflow in RLE length parsing when decompressing corrupt bzip2 data. diff --git a/crypto/openssl/ssl/s3_clnt.c b/crypto/openssl/ssl/s3_clnt.c index e52e9cadc9f5..23a07b16f650 100644 --- a/crypto/openssl/ssl/s3_clnt.c +++ b/crypto/openssl/ssl/s3_clnt.c @@ -1289,6 +1289,7 @@ int ssl3_get_key_exchange(SSL *s) s->session->sess_cert->peer_ecdh_tmp=ecdh; ecdh=NULL; BN_CTX_free(bn_ctx); + bn_ctx = NULL; EC_POINT_free(srvr_ecpoint); srvr_ecpoint = NULL; } diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 879b9b0f859f..510cd16153cf 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.3" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |