[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4e360445473c3da938703a8142a36cf6ee86a191 (commit)
      from  2b988423252232b2202f32a4d702f1cc24de5369 (commit)


- Log -----------------------------------------------------------------
commit 4e360445473c3da938703a8142a36cf6ee86a191
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Aug 7 12:38:16 2018 +0200

    Check early that the config target exists and isn't a template
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6885)

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

Summary of changes:
 Configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 9f728b9..0592712 100755
--- a/Configure
+++ b/Configure
@@ -1034,11 +1034,12 @@ if ($d) {
 	$target = $t;
     }
 }
+
+&usage if !$table{$target} || $table{$target}->{template};
+
 $config{target} = $target;
 my %target = resolve_config($target);
 
-&usage if (!%target || $target{template});
-
 foreach (keys %target_attr_translate) {
     $target{$target_attr_translate{$_}} = $target{$_}
         if $target{$_};