[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  a0d893f9b403e2e435b39b4adf14ebffadd4ea89 (commit)
      from  46905cd473db84649b39850c02056883c3da0960 (commit)


- Log -----------------------------------------------------------------
commit a0d893f9b403e2e435b39b4adf14ebffadd4ea89
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jul 22 10:56:25 2018 +0200

    Configure: Display error/warning on deprecated/unsupported options after loop
    
    Fixes #6755
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6759)
    
    (cherry picked from commit ddbe700e93e34694519d303e1b4e4525184c9dad)

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

Summary of changes:
 Configure | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Configure b/Configure
index 7f073b6..f819cab 100755
--- a/Configure
+++ b/Configure
@@ -756,21 +756,21 @@ while (@argvcopy)
 		else
 			{ $config{options} .= " ".$_; }
 		}
+	}
 
-        if (defined($config{api}) && !exists $apitable->{$config{api}}) {
-		die "***** Unsupported api compatibility level: $config{api}\n",
-        }
+if (defined($config{api}) && !exists $apitable->{$config{api}}) {
+	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: ",
-			join(", ", keys %unsupported_options), "\n";
-		}
+if (keys %deprecated_options)
+	{
+	warn "***** Deprecated options: ",
+		join(", ", keys %deprecated_options), "\n";
+	}
+if (keys %unsupported_options)
+	{
+	die "***** Unsupported options: ",
+		join(", ", keys %unsupported_options), "\n";
 	}
 
 if ($libs =~ /(^|\s)-Wl,-rpath,/