util/perl/OpenSSL/config.pm: remove expand() and use eval

The strings we expand contain other variable references than just
${MACHINE}.  Instead of having to remember what to expand, we simply
evaluate the string as a, well, string.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11230)

diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index 53a77b3424de7b539f5d836b4f687ce8ae843db0..3536f12d2bd5087aa6de09ae2875c2a7249bcc31 100755 (executable)
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -193,13 +193,6 @@ sub maybe_abort {
     }
 }
 
-# Expand variable references in a string.
-sub expand {
-    my $var = shift;
-    $var =~ s/\$\{MACHINE\}/${MACHINE}/;
-    return $var;
-}
-
 # Look for ISC/SCO with its unique uname program
 sub is_sco_uname {
     open UNAME, "uname -X 2>/dev/null|" or return '';
@@ -248,7 +241,7 @@ sub guess_system {
     my $REL = is_sco_uname();
     if ( $REL ne "" ) {
         my $result = get_sco_type($REL);
-        return expand($result) if $result ne '';
+        return eval "\"$result\"" if $result ne '';
     }
 
     # Now pattern-match
@@ -259,7 +252,7 @@ sub guess_system {
         # Trailing $ omitted on purpose.
         next if $sys !~ /^$pat/;
         my $result = @$tuple[1];
-        return expand($result);
+        return eval "\"$result\"";
     }
 
     # Complex cases.
@@ -269,7 +262,7 @@ sub guess_system {
         next if $sys !~ /^$pat/;
         my $ref = @$tuple[1];
         my $result = &$ref;
-        return expand($result);
+        return eval "\"$result\"";
     }
 
     # Oh well.