diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-03-20 07:12:02 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-03-20 07:12:02 +0000 |
| commit | 2212159696100a66e1a270a87e0bff1a9aadc3ed (patch) | |
| tree | cf68c236c2dca271c5da03b3fe2931a0121bc787 /sys/conf/newvers.sh | |
| parent | f998a156a4d4b93afcf6df95915b368ba049cb6b (diff) | |
| download | src-2212159696100a66e1a270a87e0bff1a9aadc3ed.tar.gz src-2212159696100a66e1a270a87e0bff1a9aadc3ed.zip | |
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
Notes
Notes:
svn path=/releng/9.3/; revision=280275
Diffstat (limited to 'sys/conf/newvers.sh')
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |