Fixed handling of CR+LF line endings in PEM objects.

[BearSSL] / src / codec / pemdec.t0

diff --git a/src/codec/pemdec.t0 b/src/codec/pemdec.t0
index 7a0798c..ba4a9e2 100644 (file)
--- a/src/codec/pemdec.t0
+++ b/src/codec/pemdec.t0
@@ -144,7 +144,8 @@ cc: read8-native ( -- x ) {
        begin
                over ifnot 2drop skip-newline 0 ret then
                read8 dup `\n = if 2drop orig-len swap - ret then
        begin
                over ifnot 2drop skip-newline 0 ret then
                read8 dup `\n = if 2drop orig-len swap - ret then

-               norm-upper over set8 1+ swap 1- swap
+               dup `\r = if drop else norm-upper over set8 then
+               1+ swap 1- swap

        again ;
 
 \ Remove trailing dashes from the name buffer.
        again ;
 
 \ Remove trailing dashes from the name buffer.