diff --git a/lib/bearssl-esp8266/src/int/i15_montmul.c b/lib/bearssl-esp8266/src/int/i15_montmul.c
index 9d6f70a49..b2206f587 100644
--- a/lib/bearssl-esp8266/src/int/i15_montmul.c
+++ b/lib/bearssl-esp8266/src/int/i15_montmul.c
@@ -141,8 +141,8 @@ loop%=:                                                            \n\
 
 		py = &y[0];				// addresses of both arrays that will be scanned as uint16_t
 		pm = &m[0];
-		int py_unaligned = (((int)py) & 2) != 0;
-		int pm_unaligned = (((int)pm) & 2) != 0;
+		int py_unaligned = (((intptr_t)py) & 2) != 0;
+		int pm_unaligned = (((intptr_t)pm) & 2) != 0;
 		uint32_t ty, tm;	// 32 bits buffers
 		if (!py_unaligned && !pm_unaligned) {
 			// both are aligned to 32 bits, we always skip the first 16 bits
diff --git a/lib/bearssl-esp8266/src/x509/skey_decoder.c b/lib/bearssl-esp8266/src/x509/skey_decoder.c
index 192abcaa0..47adab0eb 100644
--- a/lib/bearssl-esp8266/src/x509/skey_decoder.c
+++ b/lib/bearssl-esp8266/src/x509/skey_decoder.c
@@ -158,7 +158,7 @@ static const unsigned char t0_codeblock[] PROGMEM = {
 	0x02, 0x06, 0x1E, 0x00, 0x00, 0x19, 0x19, 0x00, 0x00, 0x01, 0x0B, 0x00,
 	0x00, 0x01, 0x00, 0x20, 0x14, 0x06, 0x08, 0x01, 0x01, 0x21, 0x20, 0x22,
 	0x20, 0x04, 0x75, 0x13, 0x00, 0x00, 0x01,
-	T0_INT2(3 * BR_X509_BUFSIZE_KEY), 0x00, 0x01, 0x01, 0x87, 0xFF, 0xFF,
+	T0_INT2(3 * BR_X509_BUFSIZE_SIG), 0x00, 0x01, 0x01, 0x87, 0xFF, 0xFF,
 	0x7F, 0x54, 0x57, 0x01, 0x02, 0x3E, 0x55, 0x01, 0x01, 0x0E, 0x06, 0x02,
 	0x30, 0x16, 0x57, 0x01, 0x02, 0x19, 0x0D, 0x06, 0x06, 0x13, 0x3B, 0x44,
 	0x32, 0x04, 0x1C, 0x01, 0x04, 0x19, 0x0D, 0x06, 0x08, 0x13, 0x3B, 0x01,