lmoskala/SSLClient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added out of memory warning and reset

Browse source
This commit is contained in:
Noah Laptop 2019-03-14 11:04:51 -07:00
parent 99920111ff
commit 292dd7a807
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/SSLClientImpl.cpp
View file

@ -195,7 +195,8 @@ void SSLClientImpl::stop() {
// tell the SSL connection to gracefully close // tell the SSL connection to gracefully close
br_ssl_engine_close(&m_sslctx.eng); br_ssl_engine_close(&m_sslctx.eng);
// if the engine isn't closed, and the socket is still open // if the engine isn't closed, and the socket is still open
while (br_ssl_engine_current_state(&m_sslctx.eng) != BR_SSL_CLOSED while (getWriteError() == SSL_OK
&& br_ssl_engine_current_state(&m_sslctx.eng) != BR_SSL_CLOSED
&& m_run_until(BR_SSL_RECVAPP) == 0) { && m_run_until(BR_SSL_RECVAPP) == 0) {
/* /*
* Discard any incoming application data. * Discard any incoming application data.
@ -308,7 +309,7 @@ int SSLClientImpl::m_run_until(const unsigned target) {
for (;;) { for (;;) {
unsigned state = m_update_engine(); unsigned state = m_update_engine();
// error check // error check
if (state == BR_SSL_CLOSED || getWriteError()) { if (state == BR_SSL_CLOSED || getWriteError() != SSL_OK) {
m_warn("Tried to run_until when the engine is closed", func_name); m_warn("Tried to run_until when the engine is closed", func_name);
return -1; return -1;
} }
@ -324,8 +325,6 @@ int SSLClientImpl::m_run_until(const unsigned target) {
lastState = state; lastState = state;
m_info("m_run changed state:", func_name); m_info("m_run changed state:", func_name);
printState(state); printState(state);
m_info("Memory: ", func_name);
m_info(freeMemory(), func_name);
} }
if (state & BR_SSL_RECVREC) { if (state & BR_SSL_RECVREC) {
size_t len; size_t len;
@ -473,11 +472,33 @@ unsigned SSLClientImpl::m_update_engine() {
// do we have the record you're looking for? // do we have the record you're looking for?
const auto avail = m_client->available(); const auto avail = m_client->available();
if (avail >= len) { if (avail >= len) {
int mem = freeMemory();
m_info("Memory: ", func_name);
m_info(mem, func_name);
// free memory check
// BearSSL takes up so much memory on the stack it tends
// to overflow if there isn't at least 8000 bytes available
// when it starts
if(mem < 8000) {
m_error("Out of memory! Decrease the number of sessions or the size of m_iobuf", func_name);
setWriteError(SSL_OUT_OF_MEMORY);
stop();
return 0;
}
// check for a stack overflow
// if the stack overflows we basically have to crash, and
// hope the user is ok with that
// since all memory is garbage we can't trust the cpu to
// execute anything properly
if (mem > 32 * 1024) {
// software reset
REQUEST_EXTERNAL_RESET;
// can't print anything, so pray for reset
while (1) { }
}
m_info("Read bytes from client: ", func_name); m_info("Read bytes from client: ", func_name);
m_info(avail, func_name); m_info(avail, func_name);
m_info(len, func_name); m_info(len, func_name);
m_info("Memory: ", func_name);
m_info(freeMemory(), func_name);
// I suppose so! // I suppose so!
int rlen = m_client->read(buf, len); int rlen = m_client->read(buf, len);
if (rlen <= 0) { if (rlen <= 0) {
@ -539,6 +560,7 @@ void SSLClientImpl::m_print_ssl_error(const int ssl_error, const DebugLevel leve
case SSL_CLIENT_WRTIE_ERROR: Serial.println("SSL_CLIENT_WRITE_FAIL"); break; case SSL_CLIENT_WRTIE_ERROR: Serial.println("SSL_CLIENT_WRITE_FAIL"); break;
case SSL_BR_WRITE_ERROR: Serial.println("SSL_BR_WRITE_ERROR"); break; case SSL_BR_WRITE_ERROR: Serial.println("SSL_BR_WRITE_ERROR"); break;
case SSL_INTERNAL_ERROR: Serial.println("SSL_INTERNAL_ERROR"); break; case SSL_INTERNAL_ERROR: Serial.println("SSL_INTERNAL_ERROR"); break;
case SSL_OUT_OF_MEMORY: Serial.println("SSL_OUT_OF_MEMORY"); break;
} }
} }

10
src/SSLClientImpl.h
View file

@ -26,6 +26,13 @@
#ifndef SSLClientImpl_H_ #ifndef SSLClientImpl_H_
#define SSLClientImpl_H_ #define SSLClientImpl_H_
// system reset definitions
#define SYSRESETREQ (1<<2)
#define VECTKEY (0x05fa0000UL)
#define VECTKEY_MASK (0x0000ffffUL)
#define AIRCR (*(uint32_t*)0xe000ed0cUL) // fixed arch-defined address
#define REQUEST_EXTERNAL_RESET (AIRCR=(AIRCR&VECTKEY_MASK)|VECTKEY|SYSRESETREQ)
/** error enums /** error enums
* Static constants defining the possible errors encountered * Static constants defining the possible errors encountered
* Read from getWriteError(); * Read from getWriteError();
@ -36,7 +43,8 @@ enum Error {
SSL_BR_CONNECT_FAIL, SSL_BR_CONNECT_FAIL,
SSL_CLIENT_WRTIE_ERROR, SSL_CLIENT_WRTIE_ERROR,
SSL_BR_WRITE_ERROR, SSL_BR_WRITE_ERROR,
SSL_INTERNAL_ERROR SSL_INTERNAL_ERROR,
SSL_OUT_OF_MEMORY
}; };
/** Debug level enum /** Debug level enum