From 0cb8cce5480d884c8f6d1c3feed08ceb98381cd4 Mon Sep 17 00:00:00 2001 From: Noah Laptop Date: Tue, 19 Feb 2019 11:51:33 -0800 Subject: [PATCH] started writing class for an SSL Client --- SSLClient.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++ src/SSLClient.cpp | 22 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 src/SSLClient.cpp diff --git a/SSLClient.h b/SSLClient.h index bf50be5..8711efa 100644 --- a/SSLClient.h +++ b/SSLClient.h @@ -31,12 +31,66 @@ * And then call the functions they normally would with EthernetClient using SSLCLient. */ +#include #include "bearssl.h" +#include "Client.h" #ifdef SSLClient_H_ #define SSLClient_H_ +template +class SSLClient : public Client { +public: + /** Ctor + * Creates a new dynamically allocated Client object based on the + * one passed to client + * We copy the client because we aren't sure the Client object + * is going to exists past the inital creation of the SSLClient. + * @param client the (Ethernet)client object + */ + static_assert(std::is_base_of(Client, C)::value, "C must be a Client Class!"); + SSLClient(const C &client): + m_client(client) + { + } + /** Dtor is implicit since unique_ptr handles it fine */ + /** + * The virtual functions defining a Client are below + * Most of them smply pass through + */ + virtual int availableForWrite(void) const { return m_client.availableForWrite(); }; + virtual operator bool() const { return static_cast(m_client); } + virtual bool operator==(const bool value) const { return bool() == value; } + virtual bool operator!=(const bool value) const { return bool() != value; } + virtual bool operator==(const C& rhs) const { return m_client.operator==(rhs); } + virtual bool operator!=(const C& rhs) const { return !this->operator==(rhs); } + virtual uint16_t localPort() const { return m_client.localPort(); } + virtual IPAddress remoteIP() const { return m_client.remoteIP(); } + virtual uint16_t remotePort() const { return m_client.remotePort(); } + virtual void setConnectionTimeout(uint16_t timeout) { m_client.setConnectionTimeout(timeout); } + + /** functions specific to the EthernetClient which I'll have to override */ + uint8_t status() const; + uint8_t getSocketNumber() const; + /** functions dealing with read/write that BearSSL will be injected into */ + virtual int connect(IPAddress ip, uint16_t port); + virtual int connect(const char *host, uint16_t port); + virtual size_t write(uint8_t); + virtual size_t write(const uint8_t *buf, size_t size); + virtual int available(); + virtual int read(); + virtual int read(uint8_t *buf, size_t size); + virtual int peek(); + virtual void flush(); + virtual void stop(); + virtual uint8_t connected(); + + +private: + // create a copy of the class + C m_client; +}; #endif /** SSLClient_H_ */ \ No newline at end of file diff --git a/src/SSLClient.cpp b/src/SSLClient.cpp new file mode 100644 index 0000000..42f41bd --- /dev/null +++ b/src/SSLClient.cpp @@ -0,0 +1,22 @@ +/* Copyright 2019 OSU OPEnS Lab + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this + * software and associated documentation files (the "Software"), to deal in the Software + * without restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "SSLClient.h" +