From: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Fri, 26 Jan 2024 10:27:02 +0000 (+0100)
Subject: chomp does not work on windows.
X-Git-Tag: openssl-3.3.0-alpha1~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e94e2b11d73ed22c601f818b31b7c4ca281f5d1;p=thirdparty%2Fopenssl.git

chomp does not work on windows.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)
---

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 08c82c0c52d..3ecbd1893e0 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -296,7 +296,8 @@ sub start
     # Process the output from s_server until we find the ACCEPT line, which
     # tells us what the accepting address and port are.
     while (<$sout>) {
-        chomp;
+        print;
+        s/\R$//; # chomp does not work on windows.
         next unless (/^ACCEPT\s.*:(\d+)$/);
         $self->{server_port} = $1;
         last;