[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  01451721afebabd0b7bdcd4cb3a183c9b590d266 (commit)
      from  37467b2752f75ce80437120f704452982b7c1998 (commit)


- Log -----------------------------------------------------------------
commit 01451721afebabd0b7bdcd4cb3a183c9b590d266
Author: Richard Levitte <levi...@openssl.org>
Date:   Thu Oct 21 09:35:07 2021 +0200

    Configurations/windows-makefile.tmpl: obj2bin(): use the resource file too
    
    When remaking how programs were linked, the variable `$ress` was forgotten.
    Unfortunately, perl treats this with silence.
    
    Fixes #16870
    Fixes #16667
    
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    Reviewed-by: Tim Hudson <t...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16875)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/windows-makefile.tmpl 
b/Configurations/windows-makefile.tmpl
index 78d39ffb4b..81a94ee19f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -983,6 +983,7 @@ EOF
                 @{$args{objs}};
      my @deps = compute_lib_depends(@{$args{deps}});
      my $objs = join($target{ld_resp_delim}, @objs);
+     my $ress = join($target{ld_resp_delim}, @ress);
      my $linklibs = join("", map { "$_$target{ld_resp_delim}" } @deps);
      my $deps = join(" ", @objs, @ress, @deps);
      return <<"EOF";