[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ddbe700e93e34694519d303e1b4e4525184c9dad (commit)
      from  b709babbca0498cd2b05f543b09f57f4a670298e (commit)


- Log -----------------------------------------------------------------
commit ddbe700e93e34694519d303e1b4e4525184c9dad
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)

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

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

diff --git a/Configure b/Configure
index 1b4e1d2..de226f1 100755
--- a/Configure
+++ b/Configure
@@ -888,21 +888,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 any %useradd entry has been set, we must check that the "make