[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  09803e9ce3a8a555e7014ebd11b4c80f9d300cf0 (commit)
      from  5723a8ec514930c7c49d080cd7a2b17a8f8c7afa (commit)


- Log -----------------------------------------------------------------
commit 09803e9ce3a8a555e7014ebd11b4c80f9d300cf0
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 23 03:05:49 2020 +0200

    configdata.pm.in, util/dofile.pl: Make a HERE document stricter.
    
    Fixes #13221
    Fixes #12743
    Fixes #12078
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13225)

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

Summary of changes:
 configdata.pm.in | 2 +-
 util/dofile.pl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configdata.pm.in b/configdata.pm.in
index 71627b48ef..279b8f75c9 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -121,7 +121,7 @@ unless (caller) {
         use OpenSSL::fallback '{- sourcefile('external', 'perl', 'MODULES.txt') -}';
         use OpenSSL::Template;
 
-        my $prepend = <<"_____";
+        my $prepend = <<'_____';
 use File::Spec::Functions;
 use lib '{- sourcedir('util', 'perl') -}';
 use lib '{- sourcedir('Configurations') -}';
diff --git a/util/dofile.pl b/util/dofile.pl
index 9453127d93..d1ed1e4098 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -71,7 +71,7 @@ sub errorcallback {
 
 my $prepend = <<"_____";
 use File::Spec::Functions;
-use lib "$FindBin::Bin/../Configurations";
+use lib '$FindBin::Bin/../Configurations';
 use lib '$config{builddir}';
 use platform;
 _____