[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  6c4e2e52d87d61a6df3ddf5f67c7207387585d6c (commit)
      from  bfa6aaab45c30ced2da851ee92f8ac5942f08078 (commit)


- Log -----------------------------------------------------------------
commit 6c4e2e52d87d61a6df3ddf5f67c7207387585d6c
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Mon Aug 17 12:34:17 2020 +1000

    Fix broken windows builds.
    
    A miscellaneous '\' was accidently added to set FIPSKEY=$(FIPSKEY) which was causing some
    external CI build loops to not produce test results.
    It looks like it was accidently copied from the unix variant which requires the '\'.
    Thanks to Wolfgang Beck for tracking down the issue.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12661)

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

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index c2507a6508..dfabda7eef 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -406,7 +406,7 @@ test: tests
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)
 	set PERL=$(PERL)
-	set FIPSKEY=$(FIPSKEY) \
+	set FIPSKEY=$(FIPSKEY)
 	"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
 	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
 	@$(ECHO) "Tests are not supported with your chosen Configure options"