diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-06-18 05:36:45 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-06-18 05:36:45 +0000 |
| commit | e5067d0a5e1b82f4e29bf384c2107870095dddc2 (patch) | |
| tree | 6c21e51462a9922f04c48a737d01b8c9e1ba0a2c | |
| parent | 1e093488fd8b8d5b7c314a2440b05f4a23bf79d6 (diff) | |
| download | src-test2-e5067d0a5e1b82f4e29bf384c2107870095dddc2.tar.gz src-test2-e5067d0a5e1b82f4e29bf384c2107870095dddc2.zip | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | contrib/sendmail/src/tls.c | 6 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V: debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20150618: p31 FreeBSD-EN-15:08.sendmail + Improvements to sendmail TLS/DH interoperability. [EN-15:08] + 20150612: p30 FreeBSD-SA-15:10.openssl Fix multiple vulnerabilities in OpenSSL. [SA-15:10] diff --git a/contrib/sendmail/src/tls.c b/contrib/sendmail/src/tls.c index 60d408e5e796..8bc88391d036 100644 --- a/contrib/sendmail/src/tls.c +++ b/contrib/sendmail/src/tls.c @@ -648,7 +648,7 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar ** 512 generate 512 bit parameters (fixed) ** 1024 generate 1024 bit parameters ** /file/name read parameters from /file/name - ** default is: 1024 for server, 512 for client (OK? XXX) + ** default is: 1024 */ if (bitset(TLS_I_TRY_DH, req)) @@ -672,8 +672,8 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar } if (dhparam == NULL) { - dhparam = srv ? "1" : "5"; - req |= (srv ? TLS_I_DH1024 : TLS_I_DH512); + dhparam = "1"; + req |= TLS_I_DH1024; } else if (*dhparam == '/') { diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index ca9eb2f6483d..cd1e1450a9db 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p30" +BRANCH="RELEASE-p31" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |