diff options
| author | Gordon Tetlow <gordon@FreeBSD.org> | 2017-12-09 03:45:23 +0000 |
|---|---|---|
| committer | Gordon Tetlow <gordon@FreeBSD.org> | 2017-12-09 03:45:23 +0000 |
| commit | a07b3ad89ed9c48673ee5135be80b32f69cefdfd (patch) | |
| tree | d1f9f7f6a9ae172a591ee8fa47e4c268846c976c | |
| parent | 79eb89bc8b3f04d58dff25f21343898eb2f83cf2 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | crypto/openssl/ssl/ssl.h | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20171209 p5 FreeBSD-SA-17:12.openssl + + Fix OpenSSL error state vulnerability. + 20171129 p4 FreeBSD-SA-17:11.openssl Fix OpenSSL out-of-bounds read vulnerability. diff --git a/crypto/openssl/ssl/ssl.h b/crypto/openssl/ssl/ssl.h index c15067203bb6..44ef4a3043c1 100644 --- a/crypto/openssl/ssl/ssl.h +++ b/crypto/openssl/ssl/ssl.h @@ -1544,7 +1544,7 @@ extern "C" { # define SSL_ST_BEFORE 0x4000 # define SSL_ST_OK 0x03 # define SSL_ST_RENEGOTIATE (0x04|SSL_ST_INIT) -# define SSL_ST_ERR 0x05 +# define SSL_ST_ERR (0x05|SSL_ST_INIT) # define SSL_CB_LOOP 0x01 # define SSL_CB_EXIT 0x02 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a0abc98b9af3..3615dac6b3ca 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |