fix libb64

Implements: esp8266/Arduino#2883Fixes: espressif#313Fixes: espressif#344

Author: me-no-dev

cores/esp32/libb64/cdecode.c

@@ -6,89 +6,94 @@ For details, see http://sourceforge.net/projects/libb64
 */
 
 #include"cdecode.h"
+#include<stdint.h>
 
-intbase64_decode_value(charvalue_in)
-{
-staticconstchardecoding[] ={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};
-staticconstchardecoding_size=sizeof(decoding);
-value_in-=43;
-if (value_in<0||value_in>decoding_size){
-return-1;
- }
-returndecoding[(int)value_in];
+staticintbase64_decode_value_signed(int8_tvalue_in){
+staticconstint8_tdecoding[] ={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};
+staticconstint8_tdecoding_size=sizeof(decoding);
+value_in-=43;
+if (value_in<0||value_in>decoding_size) return-1;
+returndecoding[(int)value_in];
+}
+
+voidbase64_init_decodestate(base64_decodestate*state_in){
+state_in->step=step_a;
+state_in->plainchar=0;
 }
 
-voidbase64_init_decodestate(base64_decodestate*state_in)
-{
-state_in->step=step_a;
-state_in->plainchar=0;
+staticintbase64_decode_block_signed(constint8_t*code_in, constintlength_in, int8_t*plaintext_out, base64_decodestate*state_in){
+constint8_t*codechar=code_in;
+int8_t*plainchar=plaintext_out;
+int8_tfragment;
+
+*plainchar=state_in->plainchar;
+
+switch (state_in->step){
+while (1){
+casestep_a:
+do{
+if (codechar==code_in+length_in){
+state_in->step=step_a;
+state_in->plainchar=*plainchar;
+returnplainchar-plaintext_out;
+ }
+fragment= (int8_t)base64_decode_value_signed(*codechar++);
+ } while (fragment<0);
+*plainchar= (fragment&0x03f) << 2;
+casestep_b:
+do{
+if (codechar==code_in+length_in){
+state_in->step=step_b;
+state_in->plainchar=*plainchar;
+returnplainchar-plaintext_out;
+ }
+fragment= (int8_t)base64_decode_value_signed(*codechar++);
+ } while (fragment<0);
+*plainchar++ |= (fragment&0x030) >> 4;
+*plainchar= (fragment&0x00f) << 4;
+casestep_c:
+do{
+if (codechar==code_in+length_in){
+state_in->step=step_c;
+state_in->plainchar=*plainchar;
+returnplainchar-plaintext_out;
+ }
+fragment= (int8_t)base64_decode_value_signed(*codechar++);
+ } while (fragment<0);
+*plainchar++ |= (fragment&0x03c) >> 2;
+*plainchar= (fragment&0x003) << 6;
+casestep_d:
+do{
+if (codechar==code_in+length_in){
+state_in->step=step_d;
+state_in->plainchar=*plainchar;
+returnplainchar-plaintext_out;
+ }
+fragment= (int8_t)base64_decode_value_signed(*codechar++);
+ } while (fragment<0);
+*plainchar++ |= (fragment&0x03f);
+ }
+ }
+/* control should not reach here */
+returnplainchar-plaintext_out;
 }
 
-intbase64_decode_block(constchar*code_in, constintlength_in, char*plaintext_out, base64_decodestate*state_in)
-{
-constchar*codechar=code_in;
-char*plainchar=plaintext_out;
-charfragment;
+staticintbase64_decode_chars_signed(constint8_t*code_in, constintlength_in, int8_t*plaintext_out){
+base64_decodestate_state;
+base64_init_decodestate(&_state);
+intlen=base64_decode_block_signed(code_in, length_in, plaintext_out, &_state);
+if(len>0) plaintext_out[len] =0;
+returnlen;
+}
 
-*plainchar=state_in->plainchar;
+intbase64_decode_value(charvalue_in){
+returnbase64_decode_value_signed(*((int8_t*) &value_in));
+}
 
-switch (state_in->step){
-while (1){
-casestep_a:
-do{
-if (codechar==code_in+length_in){
-state_in->step=step_a;
-state_in->plainchar=*plainchar;
-returnplainchar-plaintext_out;
- }
-fragment= (char)base64_decode_value(*codechar++);
- } while (fragment<0);
-*plainchar= (fragment&0x03f) << 2;
-casestep_b:
-do{
-if (codechar==code_in+length_in){
-state_in->step=step_b;
-state_in->plainchar=*plainchar;
-returnplainchar-plaintext_out;
- }
-fragment= (char)base64_decode_value(*codechar++);
- } while (fragment<0);
-*plainchar++ |= (fragment&0x030) >> 4;
-*plainchar= (fragment&0x00f) << 4;
-casestep_c:
-do{
-if (codechar==code_in+length_in){
-state_in->step=step_c;
-state_in->plainchar=*plainchar;
-returnplainchar-plaintext_out;
- }
-fragment= (char)base64_decode_value(*codechar++);
- } while (fragment<0);
-*plainchar++ |= (fragment&0x03c) >> 2;
-*plainchar= (fragment&0x003) << 6;
-casestep_d:
-do{
-if (codechar==code_in+length_in){
-state_in->step=step_d;
-state_in->plainchar=*plainchar;
-returnplainchar-plaintext_out;
- }
-fragment= (char)base64_decode_value(*codechar++);
- } while (fragment<0);
-*plainchar++ |= (fragment&0x03f);
- }
- }
-/* control should not reach here */
-returnplainchar-plaintext_out;
+intbase64_decode_block(constchar*code_in, constintlength_in, char*plaintext_out, base64_decodestate*state_in){
+returnbase64_decode_block_signed((int8_t*) code_in, length_in, (int8_t*) plaintext_out, state_in);
 }
 
-intbase64_decode_chars(constchar*code_in, constintlength_in, char*plaintext_out)
-{
-base64_decodestate_state;
-base64_init_decodestate(&_state);
-intlen=base64_decode_block(code_in, length_in, plaintext_out, &_state);
-if(len>0){
-plaintext_out[len] =0;
- }
-returnlen;
+intbase64_decode_chars(constchar*code_in, constintlength_in, char*plaintext_out){
+returnbase64_decode_chars_signed((int8_t*) code_in, length_in, (int8_t*) plaintext_out);
 }