From 09f86ab4fe4671ec827118d3a3004bfa84d8cd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=B4=D0=B8=D0=BE=D0=BD=20=D0=9A=D0=B2=D0=B0?= =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=BD?= Date: Thu, 19 Jan 2017 14:20:50 +0600 Subject: [PATCH 1/2] Fixed libb64 decoder. Libb64 decoder works when "char" type is signed. In esp8266 xtensa gcc "char" is unsigned, so libb64 decoder does not work. In the implementation file I replaced "char" to "int8_t" and created function wrappers in order to keep existing interface. --- cores/esp8266/libb64/cdecode.c | 42 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/cores/esp8266/libb64/cdecode.c b/cores/esp8266/libb64/cdecode.c index 25e5c384cc..6a4b6b7ffb 100755 --- a/cores/esp8266/libb64/cdecode.c +++ b/cores/esp8266/libb64/cdecode.c @@ -6,10 +6,11 @@ For details, see http://sourceforge.net/projects/libb64 */ #include "cdecode.h" +#include -int base64_decode_value(char value_in){ - static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; - static const char decoding_size = sizeof(decoding); +static int base64_decode_value_signed(int8_t value_in){ + static const int8_t decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; + static const int8_t decoding_size = sizeof(decoding); value_in -= 43; if (value_in < 0 || value_in > decoding_size) return -1; return decoding[(int)value_in]; @@ -20,10 +21,10 @@ void base64_init_decodestate(base64_decodestate* state_in){ state_in->plainchar = 0; } -int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in){ - const char* codechar = code_in; - char* plainchar = plaintext_out; - char fragment; +static int base64_decode_block_signed(const int8_t* code_in, const int length_in, int8_t* plaintext_out, base64_decodestate* state_in){ + const int8_t* codechar = code_in; + int8_t* plainchar = plaintext_out; + int8_t fragment; *plainchar = state_in->plainchar; @@ -36,7 +37,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex state_in->plainchar = *plainchar; return plainchar - plaintext_out; } - fragment = (char)base64_decode_value(*codechar++); + fragment = (int8_t)base64_decode_value_signed(*codechar++); } while (fragment < 0); *plainchar = (fragment & 0x03f) << 2; case step_b: @@ -46,7 +47,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex state_in->plainchar = *plainchar; return plainchar - plaintext_out; } - fragment = (char)base64_decode_value(*codechar++); + fragment = (int8_t)base64_decode_value_signed(*codechar++); } while (fragment < 0); *plainchar++ |= (fragment & 0x030) >> 4; *plainchar = (fragment & 0x00f) << 4; @@ -57,7 +58,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex state_in->plainchar = *plainchar; return plainchar - plaintext_out; } - fragment = (char)base64_decode_value(*codechar++); + fragment = (int8_t)base64_decode_value_signed(*codechar++); } while (fragment < 0); *plainchar++ |= (fragment & 0x03c) >> 2; *plainchar = (fragment & 0x003) << 6; @@ -68,7 +69,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex state_in->plainchar = *plainchar; return plainchar - plaintext_out; } - fragment = (char)base64_decode_value(*codechar++); + fragment = (int8_t)base64_decode_value_signed(*codechar++); } while (fragment < 0); *plainchar++ |= (fragment & 0x03f); } @@ -77,10 +78,25 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex return plainchar - plaintext_out; } -int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out){ +static int base64_decode_chars_signed(const int8_t* code_in, const int length_in, int8_t* plaintext_out){ base64_decodestate _state; base64_init_decodestate(&_state); - int len = base64_decode_block(code_in, length_in, plaintext_out, &_state); + int len = base64_decode_block_signed(code_in, length_in, plaintext_out, &_state); if(len > 0) plaintext_out[len] = 0; return len; } + +int base64_decode_value(char value_in) +{ + return base64_decode_value_signed(*((int8_t *) &value_in)); +} + +int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in) +{ + return base64_decode_block_signed( (int8_t *) code_in, length_in, (int8_t *) plaintext_out, state_in ); +} + +int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out) +{ + return base64_decode_chars_signed( (int8_t *) code_in, length_in, (int8_t *) plaintext_out ); +} From 277492a4c7fc8072da1e8556fef8bbe7e95fcbd0 Mon Sep 17 00:00:00 2001 From: Rodion Kvashnin Date: Thu, 19 Jan 2017 23:39:36 +0600 Subject: [PATCH 2/2] For style consistency. --- cores/esp8266/libb64/cdecode.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cores/esp8266/libb64/cdecode.c b/cores/esp8266/libb64/cdecode.c index 6a4b6b7ffb..aa84ef60a8 100755 --- a/cores/esp8266/libb64/cdecode.c +++ b/cores/esp8266/libb64/cdecode.c @@ -86,17 +86,14 @@ static int base64_decode_chars_signed(const int8_t* code_in, const int length_in return len; } -int base64_decode_value(char value_in) -{ - return base64_decode_value_signed(*((int8_t *) &value_in)); +int base64_decode_value(char value_in){ + return base64_decode_value_signed(*((int8_t *) &value_in)); } -int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in) -{ - return base64_decode_block_signed( (int8_t *) code_in, length_in, (int8_t *) plaintext_out, state_in ); +int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in){ + return base64_decode_block_signed((int8_t *) code_in, length_in, (int8_t *) plaintext_out, state_in); } -int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out) -{ - return base64_decode_chars_signed( (int8_t *) code_in, length_in, (int8_t *) plaintext_out ); +int base64_decode_chars(const char* code_in, const int length_in, char* plaintext_out){ + return base64_decode_chars_signed((int8_t *) code_in, length_in, (int8_t *) plaintext_out); }