File 0992-public_key-strip-the-whitespaces-at-the-ta... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0992-public_key-strip-the-whitespaces-at-the-tail-of-star.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Currently displaying revision 6a6e740c0161086d7407fd293e77c355 , Show latest

From 4c11efc238fd71d9a559bd121131ed0b6843d029 Mon Sep 17 00:00:00 2001
From: Ao Song <andy@erlang.org>
Date: Tue, 29 Sep 2020 15:12:08 +0200
Subject: [PATCH] public_key, strip the whitespaces at the tail of start line
 of PEM file

Change-Id: I67223c9cef1e2be845427e547a0a2925c641b854
---
 lib/public_key/src/pubkey_pem.erl | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 86c29a1820..a33db4ecf0 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -57,7 +57,8 @@
 %% Description: Decodes a PEM binary.
 %%--------------------------------------------------------------------		    
 decode(Bin) ->
-    decode_pem_entries(split_bin(Bin), []).
+    decode_pem_entries(
+        binary:split(Bin, [<<"\r\n">>, <<"\r">>, <<"\n">>], [global]), []).
 
 %%--------------------------------------------------------------------
 -spec encode([public_key:pem_entry()]) -> iolist().
@@ -113,7 +114,7 @@ decode_pem_entries([<<>>], Entries) ->
 decode_pem_entries([<<>> | Lines], Entries) ->
     decode_pem_entries(Lines, Entries);
 decode_pem_entries([StartLine | Lines], Entries) ->
-    Start = string:trim(StartLine),
+    Start = strip_tail_whitespace(StartLine),
     case pem_end(Start) of
 	undefined ->
 	    decode_pem_entries(Lines, Entries);
@@ -122,6 +123,20 @@ decode_pem_entries([StartLine | Lines], Entries) ->
 	    decode_pem_entries(RestLines, [decode_pem_entry(Start, Entry) | Entries])
     end.
 
+strip_tail_whitespace(Bin) when is_binary(Bin) ->
+    strip_tail_whitespace(lists:reverse(binary:bin_to_list(Bin)));
+strip_tail_whitespace([Char|Rest])
+  when Char == $ ;
+       Char == $\t;
+       Char == $\v;
+       Char == $\f;
+       Char == $\r;
+       Char == $\n ->
+    strip_tail_whitespace(Rest);
+strip_tail_whitespace(List) ->
+    binary:list_to_bin(
+        lists:reverse(List)).
+
 decode_pem_entry(Start, [<<"Proc-Type: 4,ENCRYPTED", _/binary>>, Line | Lines]) ->
     Type = asn1_type(Start),
     Cs = erlang:iolist_to_binary(Lines),
@@ -152,21 +167,6 @@ encode_encrypted_private_keyinfo(EncData, EncryptParmams) ->
     public_key:der_encode('EncryptedPrivateKeyInfo',   
 			  #'EncryptedPrivateKeyInfo'{encryptionAlgorithm = AlgorithmInfo,
 						     encryptedData = EncData}).
-split_bin(Bin) ->
-    split_bin(0, Bin).
-
-split_bin(N, Bin) ->
-    case Bin of
-	<<Line:N/binary, "\r\n", Rest/binary>> ->
-	    [Line | split_bin(0, Rest)];
-	<<Line:N/binary, "\n", Rest/binary>> ->
-	    [Line | split_bin(0, Rest)];
-	<<Line:N/binary>> ->
-	    [Line];
-	_ ->
-	    split_bin(N+1, Bin)
-    end.
-
 b64encode_and_split(Bin) ->
     split_lines(base64:encode(Bin)).
 
-- 
2.26.2

Places

File 0992-public_key-strip-the-whitespaces-at-the-tail-of-star.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Places