mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-21 10:26:06 +03:00
14262af0d1
* Cleanup base64::encode functions The implementation choice here using libb64 is generally good as it is a relatively fast implementation, however the adaptation to use PROGMEM for the translation function was a bad choice, as reading randomly PROGMEM with byte-wide access is very very very slow. Doing a naive if-snake is between 20% and 55% faster and uses less flash (about 120 bytes less) and also for reasons I don't understand 8 bytes less data RAM (maybe the removal of static?). In addition the base64::encode function was allocating for larger input a huge amount of memory (twice the total size). we can reduce that by doing a chunk-wise conversation to base64. * Create authorisation base64 encoded string without newlines Rather than first creating a string with newlines and then stripping it away in the fast path of constructing the query, we can call the right method and trust that the result does not have newlines anymore.
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
/**
|
|
* base64.cpp
|
|
*
|
|
* Created on: 09.12.2015
|
|
*
|
|
* Copyright (c) 2015 Markus Sattler. All rights reserved.
|
|
* This file is part of the ESP8266 core for Arduino.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#include "Arduino.h"
|
|
extern "C" {
|
|
#include "libb64/cencode.h"
|
|
}
|
|
#include "base64.h"
|
|
|
|
/**
|
|
* convert input data to base64
|
|
* @param data const uint8_t *
|
|
* @param length size_t
|
|
* @return String
|
|
*/
|
|
String base64::encode(const uint8_t * data, size_t length, bool doNewLines)
|
|
{
|
|
String base64;
|
|
|
|
// base64 needs more size then the source data, use cencode.h macros
|
|
size_t size = ((doNewLines ? base64_encode_expected_len( length )
|
|
: base64_encode_expected_len_nonewlines( length )) + 1);
|
|
|
|
if (base64.reserve(size))
|
|
{
|
|
|
|
base64_encodestate _state;
|
|
if (doNewLines)
|
|
{
|
|
base64_init_encodestate(&_state);
|
|
}
|
|
else
|
|
{
|
|
base64_init_encodestate_nonewlines(&_state);
|
|
}
|
|
|
|
constexpr size_t BUFSIZE = 48;
|
|
char buf[BUFSIZE + 1 /* newline */ + 1 /* NUL */];
|
|
for (size_t len = 0; len < length; len += BUFSIZE * 3 / 4)
|
|
{
|
|
size_t blocklen = base64_encode_block((const char*) data + len,
|
|
std::min( BUFSIZE * 3 / 4, length - len ), buf, &_state);
|
|
buf[blocklen] = '\0';
|
|
base64 += buf;
|
|
}
|
|
if (base64_encode_blockend(buf, &_state))
|
|
base64 += buf;
|
|
}
|
|
else
|
|
{
|
|
base64 = F("-FAIL-");
|
|
}
|
|
|
|
return base64;
|
|
}
|