From 2212159696100a66e1a270a87e0bff1a9aadc3ed Mon Sep 17 00:00:00 2001 From: Xin LI Date: Fri, 20 Mar 2015 07:12:02 +0000 Subject: 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 --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/conf/newvers.sh') diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 45afa52c7787..bd79618e2d79 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.3" -BRANCH="RELEASE-p11" +BRANCH="RELEASE-p12" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- cgit v1.2.3