From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 22 Dec 2022 10:25:16 +0000 (+0100)
Subject: 80-test_cms.t: Fix rsapssSaltlen check on MinGW
X-Git-Tag: openssl-3.2.0-alpha1~1551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55e2dd8c3162d7313d9408cb20fca8a4fe6e6f5a;p=thirdparty%2Fopenssl.git

80-test_cms.t: Fix rsapssSaltlen check on MinGW

Fixes #19907

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19957)
---

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 7101522365e..01947b4977b 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -826,7 +826,7 @@ sub rsapssSaltlen {
   my $pssparam_offset = -1;
   while ($_ = shift @asn1parse) {
     chomp;
-    next unless /:rsassaPss$/;
+    next unless /:rsassaPss/;
     # This line contains :rsassaPss, the next line contains a raw dump of the
     # RSA_PSS_PARAMS sequence; obtain its offset
     $_ = shift @asn1parse;
@@ -852,7 +852,7 @@ sub rsapssSaltlen {
   # This assumes the salt length is the last field, which may possibly be
   # incorrect if there is a non-standard trailer field, but there almost never
   # is in PSS.
-  if ($pssparam[-1] =~ /prim:\s+INTEGER\s+:([A-Fa-f0-9]+)$/) {
+  if ($pssparam[-1] =~ /prim:\s+INTEGER\s+:([A-Fa-f0-9]+)/) {
     $saltlen = hex($1);
   }