aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-29 20:43:06 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-29 20:43:06 +0000
commit5381b89e043e6a4c0316344f7fe8272596d3011c (patch)
tree01d2123772ebd99f648157d45807babe7b80be84 /sys/conf
parent3a68eb81a01613c9a6552bea8ddf211b474be68f (diff)
Fix a race condition exists in the OpenSSL TLS server extension code andreleng/8.0
a double free in the SSL client ECDH handling code. Approved by: so (simon) Security: CVE-2010-2939, CVE-2010-3864 Security: FreeBSD-SA-10:10.openssl
Notes
Notes: svn path=/releng/8.0/; revision=216063
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/newvers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ec0cc9fa8188..d1433f659867 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="8.0"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi