summaryrefslogtreecommitdiffstats
path: root/sys/conf/newvers.sh
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-03-20 07:12:02 +0000
committerdelphij <delphij@FreeBSD.org>2015-03-20 07:12:02 +0000
commit9387a8381eea4528c3960e3b758afa203bdac77f (patch)
treeaf1ae9a96e27bd4bf51e323f8832fdb2ed0a96c2 /sys/conf/newvers.sh
parented1c957e81c43faf4f46da5c96ce67bcea64f598 (diff)
downloadFreeBSD-src-9387a8381eea4528c3960e3b758afa203bdac77f.zip
FreeBSD-src-9387a8381eea4528c3960e3b758afa203bdac77f.tar.gz
Fix issues with original SA-15:06.openssl commit:
- Revert a portion of ASN1 change per suggested by OpenBSD and OpenSSL developers. The change was removed from the formal OpenSSL release and does not solve security issue. - Properly fix CVE-2015-0209 and CVE-2015-0288. Approved by: so
Diffstat (limited to 'sys/conf/newvers.sh')
-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 d4b4eac..cecfecd 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.1"
-BRANCH="RELEASE-p7"
+BRANCH="RELEASE-p8"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud