From: Richard Levitte <levitte@openssl.org>
Date: Tue, 7 Aug 2018 10:38:16 +0000 (+0200)
Subject: Check early that the config target exists and isn't a template
X-Git-Tag: OpenSSL_1_1_0i~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=32096fdac975dde7a13d463fdf256fd2955cd5ab;p=oweals%2Fopenssl.git

Check early that the config target exists and isn't a template

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6885)

(cherry picked from commit 4e360445473c3da938703a8142a36cf6ee86a191)
---

diff --git a/Configure b/Configure
index 7e482f7770..d85ff6aa4d 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 );