X-Git-Url: https://bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fcodec%2Fpemdec.t0;h=d76be446c9d178f2a0966867fe1a265ec6c2c316;hp=7a0798c5683daa36e6e3d221372aaeec676c5cc4;hb=f81a2828787c3ae7903bff66d64d71d6362ab4e1;hpb=3210f38e0491b39aec1ef419cb4114e9483089fb

diff --git a/src/codec/pemdec.t0 b/src/codec/pemdec.t0
index 7a0798c..d76be44 100644
--- a/src/codec/pemdec.t0
+++ b/src/codec/pemdec.t0
@@ -24,7 +24,7 @@ preamble {
 
 #include "inner.h"
 
-#define CTX   ((br_pem_decoder_context *)((unsigned char *)t0ctx - offsetof(br_pem_decoder_context, cpu)))
+#define CTX   ((br_pem_decoder_context *)(void *)((unsigned char *)t0ctx - offsetof(br_pem_decoder_context, cpu)))
 
 /* see bearssl_pem.h */
 void
@@ -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
-		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.