[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e80381e1a3309f5d4a783bcaa508a90187a48882 (commit)
      from  d5bdf6812439b607d08924ef875cadcf0d6e9698 (commit)


- Log -----------------------------------------------------------------
commit e80381e1a3309f5d4a783bcaa508a90187a48882
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 22 10:42:53 2016 +0100

    Get back "ssl2" as a deprecated disablable option
    
    Preserved for now for those who have scripts with the option
    "no-ssl2".  We warn that it's deprecated, and ignore it otherwise.
    
    In response to RT#4330
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 7942a59..1a89bec 100755
--- a/Configure
+++ b/Configure
@@ -328,6 +328,10 @@ foreach my $proto ((@tls, @dtls))
 	push(@disablables, "$proto-method");
 	}
 
+my @deprecated_disablables = (
+    "ssl2",
+    );
+
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
 
 my %disabled = ( # "what"         => "comment"
@@ -496,6 +500,7 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
 $config{perlargv} = [ @argvcopy ];
 
 my %unsupported_options = ();
+my %deprecated_options = ();
 foreach (@argvcopy)
 	{
 	# VMS is a case insensitive environment, and depending on settings
@@ -517,7 +522,12 @@ foreach (@argvcopy)
         if (/^(no|disable|enable)-(.+)$/)
 		{
 		my $word = $2;
-		if (!grep { $word =~ /^${_}$/ } @disablables)
+		if (grep { $word =~ /^${_}$/ } @deprecated_disablables)
+			{
+			$deprecated_options{$_} = 1;
+			next;
+			}
+		elsif (!grep { $word =~ /^${_}$/ } @disablables)
 			{
 			$unsupported_options{$_} = 1;
 			next;
@@ -700,6 +710,11 @@ foreach (@argvcopy)
 		die "***** Unsupported api compatibility level: $config{api}\n",
         }
 
+	if (keys %deprecated_options)
+		{
+		warn "***** Deprecated options: ",
+			join(", ", keys %deprecated_options), "\n";
+		}
 	if (keys %unsupported_options)
 		{
 		die "***** Unsupported options: ",