jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix libb64

Browse Source 
Implements: https://github.com/esp8266/Arduino/pull/2883
Fixes: https://github.com/espressif/arduino-esp32/issues/313
Fixes: https://github.com/espressif/arduino-esp32/issues/344
This commit is contained in:
me-no-dev 2017-05-06 18:56:25 +03:00
parent 673f453da0
commit 450df7e3f8
1 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cores/esp32/libb64/cdecode.c
View File

@ -6,29 +6,25 @@ For details, see http://sourceforge.net/projects/libb64
*/ */
#include "cdecode.h" #include "cdecode.h"
#include <stdint.h>
int base64_decode_value(char value_in) 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 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 int8_t decoding_size = sizeof(decoding);
static const char decoding_size = sizeof(decoding);
value_in -= 43; value_in -= 43;
if (value_in < 0 || value_in > decoding_size) { if (value_in < 0 || value_in > decoding_size) return -1;
return -1;
}
return decoding[(int)value_in]; return decoding[(int)value_in];
} }
void base64_init_decodestate(base64_decodestate* state_in) void base64_init_decodestate(base64_decodestate* state_in){
{
state_in->step = step_a; state_in->step = step_a;
state_in->plainchar = 0; state_in->plainchar = 0;
} }
int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in) 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;
const char* codechar = code_in; int8_t* plainchar = plaintext_out;
char* plainchar = plaintext_out; int8_t fragment;
char fragment;
*plainchar = state_in->plainchar; *plainchar = state_in->plainchar;
@ -41,7 +37,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = (int8_t)base64_decode_value_signed(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar = (fragment & 0x03f) << 2; *plainchar = (fragment & 0x03f) << 2;
case step_b: case step_b:
@ -51,7 +47,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = (int8_t)base64_decode_value_signed(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x030) >> 4; *plainchar++ |= (fragment & 0x030) >> 4;
*plainchar = (fragment & 0x00f) << 4; *plainchar = (fragment & 0x00f) << 4;
@ -62,7 +58,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = (int8_t)base64_decode_value_signed(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x03c) >> 2; *plainchar++ |= (fragment & 0x03c) >> 2;
*plainchar = (fragment & 0x003) << 6; *plainchar = (fragment & 0x003) << 6;
@ -73,7 +69,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = (int8_t)base64_decode_value_signed(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x03f); *plainchar++ |= (fragment & 0x03f);
} }
@ -82,13 +78,22 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
return plainchar - plaintext_out; 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_decodestate _state;
base64_init_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) { if(len > 0) plaintext_out[len] = 0;
plaintext_out[len] = 0;
}
return len; 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);
}