File 3912-ssh-Accept-r-n-as-well-as-n-as-line-end.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3912-ssh-Accept-r-n-as-well-as-n-as-line-end.patch of Package erlang (Revision 0e18a0502cc8ec77c7a8a467e24ca42a)

Currently displaying revision 0e18a0502cc8ec77c7a8a467e24ca42a , Show latest

From 4ac011946482a62613c8925eaa0307ca8eedb899 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 17 May 2021 14:59:17 +0200
Subject: [PATCH 2/2] ssh: Accept \r\n as well as \n as line end

---
 lib/ssh/src/ssh_file.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index da5ded101b..4815d4238b 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -802,7 +802,7 @@ decode_ssh_file(PrivPub, Algorithm, Pem, Password) ->
 
 decode_pem_keys(RawBin, Password) ->
     PemLines = split_in_lines(
-                 binary:replace(RawBin, <<"\\\n">>, <<"">>, [global])
+                 binary:replace(RawBin, [<<"\\\n">>,<<"\\\r\\\n">>],  <<"">>, [global])
                 ),
     decode_pem_keys(PemLines, Password, []).
 decode_pem_keys([], _, Acc) ->
@@ -1136,7 +1136,7 @@ split_in_nonempty_lines(Bin) ->
     skip_blank_lines_and_comments( split_in_lines(Bin) ).
 
 split_in_lines(Bin) ->
-    binary:split(Bin, <<"\n">>, [global,trim_all]).
+    binary:split(Bin, [<<"\n">>,<<"\r\n">>], [global,trim_all]).
 
 skip_blank_lines_and_comments(Lines) ->
     lists:filter(fun(<<"#",_/binary>>) ->
-- 
2.26.2

Places

File 3912-ssh-Accept-r-n-as-well-as-n-as-line-end.patch of Package erlang (Revision 0e18a0502cc8ec77c7a8a467e24ca42a)

Places