[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Richard Levitte
levitte at openssl.org
Fri Feb 17 20:29:26 UTC 2017
The branch OpenSSL_1_1_0-stable has been updated
via eb5de0ce576df7b29d0730206bac801a0f6b808f (commit)
from 38c0fe4b19ef2c5f4c7302c75d62b506e4d55c9e (commit)
- Log -----------------------------------------------------------------
commit eb5de0ce576df7b29d0730206bac801a0f6b808f
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Feb 17 20:48:28 2017 +0100
If all versions of a proto are disabled, disabled the proto as well
For example, 'no-dtls1 no-dtls1_2' will imply 'no-dtls'
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2670)
(cherry picked from commit 343a7467c270c54a8e1c85e88e807a1c2e0b6127)
-----------------------------------------------------------------------
Summary of changes:
Configure | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Configure b/Configure
index aee7cc3..9a25da5 100755
--- a/Configure
+++ b/Configure
@@ -456,6 +456,8 @@ my @disable_cascades = (
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
+ sub { 0 == scalar grep { !$disabled{$_} } @dtls }
+ => [ "dtls" ],
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
"md5" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
@@ -476,6 +478,8 @@ my @disable_cascades = (
"dtls1", "dtls1_2" ],
"tls" => [ @tls ],
+ sub { 0 == scalar grep { !$disabled{$_} } @tls }
+ => [ "tls" ],
# SRP and HEARTBEATS require TLSEXT
"tlsext" => [ "srp", "heartbeats" ],
More information about the openssl-commits
mailing list