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

use libbase64 macro to calculate base64 length (#2007)

Browse Source
This commit is contained in:
Marcel Kottmann 2018-11-19 17:01:38 +01:00 committed by Me No Dev
parent 3902aa4019
commit 259ff80d60
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cores/esp32/base64.cpp
View File

@ -37,8 +37,7 @@ extern "C" {
*/ */
String base64::encode(uint8_t * data, size_t length) String base64::encode(uint8_t * data, size_t length)
{ {
// base64 needs more size then the source data size_t size = base64_encode_expected_len(length) + 1;
size_t size = ((length * 1.6f) + 1);
char * buffer = (char *) malloc(size); char * buffer = (char *) malloc(size);
if(buffer) { if(buffer) {
base64_encodestate _state; base64_encodestate _state;

9
cores/esp32/libb64/cencode.c
View File

@ -7,13 +7,10 @@ For details, see http://sourceforge.net/projects/libb64
#include "cencode.h" #include "cencode.h"
const int CHARS_PER_LINE = 72;
void base64_init_encodestate(base64_encodestate* state_in) void base64_init_encodestate(base64_encodestate* state_in)
{ {
state_in->step = step_A; state_in->step = step_A;
state_in->result = 0; state_in->result = 0;
state_in->stepcount = 0;
} }
char base64_encode_value(char value_in) char base64_encode_value(char value_in)
@ -68,12 +65,6 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
*codechar++ = base64_encode_value(result); *codechar++ = base64_encode_value(result);
result = (fragment & 0x03f) >> 0; result = (fragment & 0x03f) >> 0;
*codechar++ = base64_encode_value(result); *codechar++ = base64_encode_value(result);
++(state_in->stepcount);
if (state_in->stepcount == CHARS_PER_LINE/4) {
*codechar++ = '\n';
state_in->stepcount = 0;
}
} }
} }
/* control should not reach here */ /* control should not reach here */