From 157698bef9d673392ebd36a9718f86ac81dc2808 Mon Sep 17 00:00:00 2001
From: Beau Hardy <psychogony@users.noreply.github.com>
Date: Mon, 8 May 2017 20:01:24 +1200
Subject: [PATCH] Base64: add option to disable any newlines in output. (#3208)

Closes #3194
---
 cores/esp8266/base64.cpp       | 15 +++++++++++----
 cores/esp8266/base64.h         |  7 +++++--
 cores/esp8266/libb64/cencode.c |  9 ++++++++-
 cores/esp8266/libb64/cencode.h |  2 ++
 4 files changed, 26 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 cores/esp8266/base64.cpp
 mode change 100644 => 100755 cores/esp8266/base64.h

diff --git a/cores/esp8266/base64.cpp b/cores/esp8266/base64.cpp
old mode 100644
new mode 100755
index 11deb0af04..a1e6261890
--- a/cores/esp8266/base64.cpp
+++ b/cores/esp8266/base64.cpp
@@ -35,13 +35,20 @@ extern "C" {
  * @param length size_t
  * @return String
  */
-String base64::encode(uint8_t * data, size_t length) {
+String base64::encode(uint8_t * data, size_t length, bool doNewLines) {
     // base64 needs more size then the source data
     size_t size = ((length * 1.6f) + 1);
     char * buffer = (char *) malloc(size);
     if(buffer) {
         base64_encodestate _state;
-        base64_init_encodestate(&_state);
+        if(doNewLines)
+        {
+            base64_init_encodestate(&_state);
+        }
+        else 
+        {
+            base64_init_encodestate_nonewlines(&_state);
+        }
         int len = base64_encode_block((const char *) &data[0], length, &buffer[0], &_state);
         len = base64_encode_blockend((buffer + len), &_state);
 
@@ -57,7 +64,7 @@ String base64::encode(uint8_t * data, size_t length) {
  * @param text String
  * @return String
  */
-String base64::encode(String text) {
-    return base64::encode((uint8_t *) text.c_str(), text.length());
+String base64::encode(String text, bool doNewLines) {
+    return base64::encode((uint8_t *) text.c_str(), text.length(), doNewLines);
 }
 
diff --git a/cores/esp8266/base64.h b/cores/esp8266/base64.h
old mode 100644
new mode 100755
index 39be2d397c..67140123ed
--- a/cores/esp8266/base64.h
+++ b/cores/esp8266/base64.h
@@ -27,8 +27,11 @@
 
 class base64 {
     public:
-        static String encode(uint8_t * data, size_t length);
-        static String encode(String text);
+        // NOTE: The default behaviour of backend (lib64)
+        // is to add a newline every 72 (encoded) characters output.
+        // This may 'break' longer uris and json variables
+        static String encode(uint8_t * data, size_t length, bool doNewLines = true);
+        static String encode(String text, bool doNewLines = true);
     private:
 };
 
diff --git a/cores/esp8266/libb64/cencode.c b/cores/esp8266/libb64/cencode.c
index 4631f09ed2..0859f36605 100755
--- a/cores/esp8266/libb64/cencode.c
+++ b/cores/esp8266/libb64/cencode.c
@@ -13,6 +13,13 @@ void base64_init_encodestate(base64_encodestate* state_in){
   state_in->step = step_A;
   state_in->result = 0;
   state_in->stepcount = 0;
+  state_in->stepsnewline = CHARS_PER_LINE;
+}
+
+
+void base64_init_encodestate_nonewlines(base64_encodestate* state_in){
+  base64_init_encodestate(state_in);
+  state_in->stepsnewline = -1;
 }
 
 char base64_encode_value(char value_in){
@@ -65,7 +72,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
       *codechar++ = base64_encode_value(result);
       
       ++(state_in->stepcount);
-      if (state_in->stepcount == CHARS_PER_LINE/4){
+      if ((state_in->stepcount == CHARS_PER_LINE/4) && (state_in->stepsnewline > 0)){
         *codechar++ = '\n';
         state_in->stepcount = 0;
       }
diff --git a/cores/esp8266/libb64/cencode.h b/cores/esp8266/libb64/cencode.h
index 058cc5d1a6..7890e7a4a6 100755
--- a/cores/esp8266/libb64/cencode.h
+++ b/cores/esp8266/libb64/cencode.h
@@ -22,9 +22,11 @@ typedef struct {
   base64_encodestep step;
   char result;
   int stepcount;
+  int stepsnewline;
 } base64_encodestate;
 
 void base64_init_encodestate(base64_encodestate* state_in);
+void base64_init_encodestate_nonewlines(base64_encodestate* state_in);
 
 char base64_encode_value(char value_in);