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

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  32096fdac975dde7a13d463fdf256fd2955cd5ab (commit)
      from  29cbeb9f0279678706dc9f5d96bcb64fc766658f (commit)


- Log -----------------------------------------------------------------
commit 32096fdac975dde7a13d463fdf256fd2955cd5ab
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)
    
    (cherry picked from commit 4e360445473c3da938703a8142a36cf6ee86a191)

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

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

diff --git a/Configure b/Configure
index 7e482f7..d85ff6a 100755
--- a/Configure
+++ b/Configure
@@ -911,11 +911,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});
-
 my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
 $config{conf_files} = [ sort keys %conf_files ];
 %target = ( %{$table{DEFAULTS}}, %target );