Merge pull request #293 from pennam/bearssl-error

Add command to read BearSSL client errorCode

Author: pennam

src/WiFiClient.cpp

@@ -199,6 +199,11 @@ int WiFiClient::setECTrustAnchorBearSSL(const uint8_t *dName, uint32_t dNameSize
   return ServerDrv::setECTrustAnchorBearSSL(dName, dNameSize, flags, curve, key, keySize);
 }
 
+int WiFiClient::errorCodeBearSSL()
+{
+  return ServerDrv::errorCodeBearSSL();
+}
+
 size_t WiFiClient::write(uint8_t b) {
 	  return write(&b, 1);
 }

src/WiFiClient.h

@@ -39,6 +39,7 @@ class WiFiClient : public Client {
   virtual int connectBearSSL(IPAddress ip, uint16_t port);
   virtual int connectBearSSL(const char *host, uint16_t port);
   virtual int setECTrustAnchorBearSSL(const uint8_t *dName, uint32_t dNameSize, uint16_t flags, uint16_t curve, const uint8_t *key, uint32_t keySize);
+  virtual int errorCodeBearSSL();
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
   virtual size_t retry(const uint8_t *buf, size_t size, bool write);

src/WiFiSSLClient.cpp

@@ -63,3 +63,8 @@ int WiFiBearSSLClient::setECTrustAnchor(const uint8_t *dName, uint32_t dNameSize
 {
   return WiFiClient::setECTrustAnchorBearSSL(dName, dNameSize, flags, curve, key, keySize);
 }
+
+int WiFiBearSSLClient::errorCode()
+{
+  return WiFiClient::errorCodeBearSSL();
+}

src/WiFiSSLClient.h

@@ -41,6 +41,7 @@ class WiFiBearSSLClient : public WiFiClient {
 	virtual int connect(IPAddress ip, uint16_t port);
 	virtual int connect(const char* host, uint16_t port);
   virtual int setECTrustAnchor(const uint8_t *dName, uint32_t dNameSize, uint16_t flags, uint16_t curve, const uint8_t *key, uint32_t keySize);
+  virtual int errorCode();
 };
 
 #endif /* WIFISSLCLIENT_H */

src/utility/server_drv.cpp

@@ -559,4 +559,26 @@ uint8_t ServerDrv::setECTrustAnchorBearSSL(const uint8_t *dName, uint32_t dNameS
     return result == 0;
 }
 
+int ServerDrv::errorCodeBearSSL()
+{
+    WAIT_FOR_SLAVE_SELECT();
+
+    // Send Command
+    SpiDrv::sendCmd(BRSSL_ERROR_CODE, PARAM_NUMS_0);
+
+    SpiDrv::spiSlaveDeselect();
+    //Wait the reply elaboration
+    SpiDrv::waitForSlaveReady();
+    SpiDrv::spiSlaveSelect();
+
+    // Wait for reply
+    int _data = 0;
+    uint8_t _dataLen = 0;
+    SpiDrv::waitResponseCmd(BRSSL_ERROR_CODE, PARAM_NUMS_1, (uint8_t*)&_data, &_dataLen);
+
+    SpiDrv::spiSlaveDeselect();
+
+    return _data;
+}
+
 ServerDrv serverDrv;

src/utility/server_drv.h

@@ -64,6 +64,8 @@ class ServerDrv
     static uint8_t getSocket();
 
     static uint8_t setECTrustAnchorBearSSL(const uint8_t *dName, uint32_t dNameSize, uint16_t flags, uint16_t curve, const uint8_t *key, uint32_t keySize);
+
+    static int errorCodeBearSSL();
 };
 
 extern ServerDrv serverDrv;

src/utility/wifi_spi.h

@@ -127,6 +127,7 @@ enum {
 	RENAME_FILE			= 0x66,
 	DOWNLOAD_OTA		= 0x67,
 	BRSSL_SET_EC_TA     = 0x68,
+	BRSSL_ERROR_CODE    = 0x69,
 
 	// Low-level BSD-like sockets functions.
 	// From 0x70 to 0x7F