From 5e1a3b41ca9ed7ea86064f953e1304d766cc6756 Mon Sep 17 00:00:00 2001
From: Noah Laptop <noah@koontzs.com>
Date: Tue, 13 Aug 2019 12:29:09 -0700
Subject: [PATCH] fix SSLObj functionality

---
 src/SSLObj.cpp | 32 ++++++++++++++++++++------------
 src/SSLObj.h   |  8 +++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/SSLObj.cpp b/src/SSLObj.cpp
index 68682ea..73ead13 100644
--- a/src/SSLObj.cpp
+++ b/src/SSLObj.cpp
@@ -1,5 +1,12 @@
 #include "SSLObj.h"
 
+// fix for non-exception arduino platforms
+#ifdef ADAFRUIT_FEATHER_M0
+namespace std {
+    void __throw_length_error(char const*) {}
+}
+#endif
+
 struct ssl_pem_decode_state {
     std::vector<unsigned char>* vect;
     size_t index = 0;
@@ -7,23 +14,18 @@ struct ssl_pem_decode_state {
 
 static void ssl_pem_decode(void *dest_ctx, const void *src, size_t len) {
     ssl_pem_decode_state* ctx = static_cast<ssl_pem_decode_state*>(dest_ctx);
-    // copy the recieved bytes into the vector, resizing if needed
-    if (ctx->vect->size() < len + ctx->index) {
-        Serial.println("Overflow!");
-        return;
-    }
-    for (size_t i = 0; i < len; i++) (*(ctx->vect))[i + ctx->index] = static_cast<const unsigned char*>(src)[i];
+    for (size_t i = 0; i < len; i++) ctx->vect->emplace_back(static_cast<const unsigned char*>(src)[i]);
     // update index
     ctx->index += len;
 }
 
 const std::vector<unsigned char> SSLObj::make_vector_pem(const char* data, const size_t len) {
-    if (data == nullptr || len == 0) return { 0 };
+    if (data == nullptr || len < 80) return {};
     // initialize the bearssl PEM context
     br_pem_decoder_context pctx;
     br_pem_decoder_init(&pctx);
     // create a temporary vector
-    std::vector<unsigned char> temp(len * 3 / 4 + 5);
+    std::vector<unsigned char> temp;
     // initialize the DER storage context
     ssl_pem_decode_state state;
     state.vect = &temp;
@@ -36,22 +38,28 @@ const std::vector<unsigned char> SSLObj::make_vector_pem(const char* data, const
     do {
         index += br_pem_decoder_push(&pctx, static_cast<const void*>(&data[index]), len - index);
         br_state = br_pem_decoder_event(&pctx);
-    } while (br_state != BR_PEM_ERROR && br_state != BR_PEM_END_OBJ);
+        // if we found the begining object, reserve the vector based on the remaining relavent bytes
+        if (br_state == BR_PEM_BEGIN_OBJ) {
+            // 22 = five dashes for header and footer + four newlines - character difference between `BEGIN` and `END`
+            const size_t relavant_bytes_base64 = len - (2*strlen(br_pem_decoder_name(&pctx)) + 22);
+            temp.reserve(relavant_bytes_base64 * 3 / 4);
+        }
+    } while (br_state != BR_PEM_ERROR && br_state != BR_PEM_END_OBJ && len != index);
     // error check
     if (br_state == BR_PEM_ERROR) {
         // set data to error
         temp.clear();
     }
     // else we're good!
-    return { temp };
+    return temp;
 }
 
 const std::vector<unsigned char> SSLObj::make_vector_der(const char* data, const size_t len) {
-    if (data == nullptr || len == 0) return { 0 };
+    if (data == nullptr || len == 0) return {};
     // create a temporary vector
     std::vector<unsigned char> temp(len);
     // copy the elements over
     for (size_t i = 0; i < len; i++) temp[i] = data[i];
     // return the new SSLObj
-    return { temp };
+    return temp;
 }
\ No newline at end of file
diff --git a/src/SSLObj.h b/src/SSLObj.h
index 25e8827..8d5ecaf 100644
--- a/src/SSLObj.h
+++ b/src/SSLObj.h
@@ -24,14 +24,16 @@
  * This file contains a utility class to take PEM input and store it as a DER object
  * for later use by BearSSL.
  */
-
-#include <vector>
+#include <cstring>
 #include "bearssl_pem.h"
-#include "Arduino.h"
 
 #ifndef SSLObj_H_
 #define SSLObj_H_
 
+#undef min
+#undef max
+#include <vector>
+
 /**
  * \brief This namespace works with raw DER byte arrays for use later with TLS mutual auth.
  *