[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b1eae34bbe546062c44d26882092fe9db96306d3 (commit)
      from  fa2a7490c0b22083388fb81497998730f000e82d (commit)


- Log -----------------------------------------------------------------
commit b1eae34bbe546062c44d26882092fe9db96306d3
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jan 21 16:55:42 2021 +0000

    Fix running mingw dhparam test under wine
    
    The dhparam test was failing to properly handle line endings when
    running a mingw configured build under wine.
    
    Fixes #13557
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13923)

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

Summary of changes:
 test/recipes/20-test_dhparam.t | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/recipes/20-test_dhparam.t b/test/recipes/20-test_dhparam.t
index 42eef173b7..a4d05dea7a 100644
--- a/test/recipes/20-test_dhparam.t
+++ b/test/recipes/20-test_dhparam.t
@@ -36,11 +36,13 @@ sub checkdhparams {
         #Text file. Check it looks like PEM
         open(PEMFILE, '<', $file) or die $!;
         if (my $firstline = <PEMFILE>) {
-            chomp($firstline);
+            $firstline =~ s/\R$//;
             if ($firstline eq "-----BEGIN DH PARAMETERS-----") {
                 $pemtype = "PKCS3";
             } elsif ($firstline eq "-----BEGIN X9.42 DH PARAMETERS-----") {
                 $pemtype = "X9.42";
+            } else {
+                $pemtype = "";
             }
         } else {
             $pemtype = "";