Skip to content

Integrate ArduinoBearSSL 1.5.0 with ArduinoIoTCloud and reduce ressource requirements. #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 1, 2020
Merged

Integrate ArduinoBearSSL 1.5.0 with ArduinoIoTCloud and reduce ressource requirements. #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
de38265
Importing ArduinoBearSSL 1.5.0
aentinger Jul 1, 2020
989e721
Removing SHA classes since they are not used within the AIoTC firmwar…
aentinger Jul 1, 2020
0f09c25
Removing no longer required BearSSLClient constructors
aentinger Jul 1, 2020
54873c2
Removing no longer needed class ArduinoBearSSL
aentinger Jul 1, 2020
483634f
Use reduced BearSSL profile to save flash/ram on the MCU
aentinger Jul 1, 2020
124bb89
Fixing spelling mistakes
aentinger Jul 1, 2020
015ad8a
Fixing example for CI build
aentinger Jul 1, 2020
e9c1940
Fixing conditional compilation for ESP targets
aentinger Jul 1, 2020
4546bcd
Moving utility/crypto to tls/utility where they fit better
aentinger Jul 1, 2020
c02a10e
The ESP8266 core brings it's own version of BearSSL, don't compile ou…
aentinger Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion examples/utility/Provisioning/Provisioning.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <ArduinoIoTCloud.h>
#include "ECCX08TLSConfig.h"

#include <ArduinoBearSSL.h>
#include <ArduinoECCX08.h>

const bool DEBUG = true;
Expand Down
8 changes: 3 additions & 5 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
#include <ArduinoIoTCloudTCP.h>
#include "utility/time/TimeService.h"
#ifdef BOARD_HAS_ECCX08
#include <ArduinoECCX08.h>
#include "utility/crypto/CryptoUtil.h"
#include "utility/crypto/BearSSLTrustAnchor.h"
#include "tls/BearSSLTrustAnchors.h"
#include "tls/utility/CryptoUtil.h"
#endif

/******************************************************************************
Expand Down Expand Up @@ -65,7 +64,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
, _mqtt_data_len{0}
, _mqtt_data_request_retransmit{false}
#ifdef BOARD_HAS_ECCX08
, _sslClient(nullptr, ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM)
, _sslClient(nullptr, ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM, getTime)
#endif
#ifdef BOARD_ESP
, _password("")
Expand Down Expand Up @@ -110,7 +109,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
if (!ECCX08.begin()) { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }
if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId)) { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }
if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
ArduinoBearSSL.onGetTime(getTime);
_sslClient.setClient(_connection->getClient());
_sslClient.setEccSlot(static_cast<int>(ECCX08Slot::Key), _eccx08_cert.bytes(), _eccx08_cert.length());
#elif defined(BOARD_ESP)
Expand Down
4 changes: 2 additions & 2 deletions src/ArduinoIoTCloudTCP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <ArduinoIoTCloud.h>

#ifdef BOARD_HAS_ECCX08
#include <ArduinoBearSSL.h>
#include "utility/crypto/ECCX08Cert.h"
#include "tls/BearSSLClient.h"
#include "tls/utility/ECCX08Cert.h"
#elif defined(BOARD_ESP)
#include <WiFiClientSecure.h>
#endif
Expand Down
Loading