aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2005-10-11 11:51:45 +0000
committerColin Percival <cperciva@FreeBSD.org>2005-10-11 11:51:45 +0000
commitb00fd6139fe7e0744defcb1acc1797287d31fd9d (patch)
tree41c54ae102c97d92871e4aa33ce7cb01796d9374
parentc8e77e814f94c0f18937ca53800cb63bdfa9db77 (diff)
downloadsrc-b00fd6139fe7e0744defcb1acc1797287d31fd9d.tar.gz
src-b00fd6139fe7e0744defcb1acc1797287d31fd9d.zip
Correct a man-in-the-middle SSL version rollback vulnerability.
Security: FreeBSD-SA-05:21.openssl Approved by: so@ (cperciva)
Notes
Notes: svn path=/releng/4.11/; revision=151234
-rw-r--r--UPDATING3
-rw-r--r--crypto/openssl/crypto/opensslv.h2
-rw-r--r--crypto/openssl/ssl/s23_srvr.c7
-rw-r--r--sys/conf/newvers.sh2
4 files changed, 6 insertions, 8 deletions
diff --git a/UPDATING b/UPDATING
index e743c931d7d3..0f0a1637e828 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20051011: p13 FreeBSD-SA-05:21.openssl
+ Correct a man-in-the-middle SSL version rollback vulnerability.
+
20050907: p12 FreeBSD-SA-05:20.cvsbug
Correct insecure temporary file usage.
diff --git a/crypto/openssl/crypto/opensslv.h b/crypto/openssl/crypto/opensslv.h
index 02f1710fb3f6..21f50f6ff2ff 100644
--- a/crypto/openssl/crypto/opensslv.h
+++ b/crypto/openssl/crypto/opensslv.h
@@ -26,7 +26,7 @@
* major minor fix final patch/beta)
*/
#define OPENSSL_VERSION_NUMBER 0x0090704fL
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7d 17 Mar 2004"
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.7d-p1 17 Mar 2004"
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
diff --git a/crypto/openssl/ssl/s23_srvr.c b/crypto/openssl/ssl/s23_srvr.c
index c5404ca0bcd4..5139477eb780 100644
--- a/crypto/openssl/ssl/s23_srvr.c
+++ b/crypto/openssl/ssl/s23_srvr.c
@@ -268,9 +268,6 @@ int ssl23_get_client_hello(SSL *s)
int n=0,j;
int type=0;
int v[2];
-#ifndef OPENSSL_NO_RSA
- int use_sslv2_strong=0;
-#endif
if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
{
@@ -519,9 +516,7 @@ int ssl23_get_client_hello(SSL *s)
}
s->state=SSL2_ST_GET_CLIENT_HELLO_A;
- if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
- use_sslv2_strong ||
- (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
+ if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
s->s2->ssl2_rollback=0;
else
/* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 2d0852476102..9c67a43d4225 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.11"
-BRANCH="RELEASE-p12"
+BRANCH="RELEASE-p13"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"