Skip to content

WiFiSSLClient: add setEccSlot method to configure client private key and certificate #254

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 2 commits into from
Feb 15, 2024
Merged

WiFiSSLClient: add setEccSlot method to configure client private key and certificate #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9efbd3c
WiFiSSLClient: add setEccSlot method to configure client private key …
pennam Feb 6, 2024
267cae5
WiFiSSLClient: configure cusutom root_ca or client credentials on con…
pennam Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions libraries/WiFiS3/src/WiFiSSLClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ int WiFiSSLClient::connect(IPAddress ip, uint16_t port) {
int WiFiSSLClient::connect(const char* host, uint16_t port) {
/* -------------------------------------------------------------------------- */
getSocket();
if (!_custom_root) {
if (_root_ca != nullptr) {
setCACert(_root_ca);
} else {
setCACert();
}
if ((_ecc_slot != -1) && (_ecc_cert != nullptr) && (_ecc_cert_len != 0)) {
setEccSlot(_ecc_slot, _ecc_cert, _ecc_cert_len);
}
string res = "";
if (_connectionTimeout) {
if(modem.write(string(PROMPT(_SSLCLIENTCONNECT)),res, "%s%d,%s,%d,%d\r\n" , CMD_WRITE(_SSLCLIENTCONNECT), _sock, host,port, _connectionTimeout)) {
Expand All @@ -60,13 +65,27 @@ void WiFiSSLClient::setCACert(const char* root_ca, size_t size) {
if(size > 0) {
modem.write_nowait(string(PROMPT(_SETCAROOT)),res, "%s%d,%d\r\n" , CMD_WRITE(_SETCAROOT), _sock, size);
if(modem.passthrough((uint8_t *)root_ca, size)) {
_custom_root = true;
_root_ca = root_ca;
}
} else {
modem.write(string(PROMPT(_SETCAROOT)),res, "%s%d\r\n" , CMD_WRITE(_SETCAROOT), _sock);
}
}

/* -------------------------------------------------------------------------- */
void WiFiSSLClient::setEccSlot(int ecc508KeySlot, const byte cert[], int certLength) {
/* -------------------------------------------------------------------------- */
getSocket();
string res = "";
if(certLength > 0) {
modem.write_nowait(string(PROMPT(_SETECCSLOT)),res, "%s%d,%d,%d\r\n" , CMD_WRITE(_SETECCSLOT), _sock, ecc508KeySlot, certLength);
modem.passthrough((uint8_t *)cert, certLength);
_ecc_slot = ecc508KeySlot;
_ecc_cert = cert;
_ecc_cert_len = certLength;
}
}

/* -------------------------------------------------------------------------- */
size_t WiFiSSLClient::write(uint8_t b){
/* -------------------------------------------------------------------------- */
Expand Down
7 changes: 6 additions & 1 deletion libraries/WiFiS3/src/WiFiSSLClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class WiFiSSLClient : public WiFiClient {
virtual int connect(IPAddress ip, uint16_t port);
virtual int connect(const char* host, uint16_t port);
void setCACert(const char* root_ca = NULL, size_t size = 0);
void setEccSlot(int ecc508KeySlot, const byte cert[], int certLength);
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *buf, size_t size);
virtual int available();
Expand All @@ -60,10 +61,14 @@ class WiFiSSLClient : public WiFiClient {

private:
int _sock;
bool _custom_root = false;
void getSocket();
int _read();
void read_if_needed(size_t s);
const char* _root_ca = nullptr;
int _ecc_slot = -1;
const byte* _ecc_cert = nullptr;
int _ecc_cert_len = 0;

};

#endif /* WIFISSLCLIENT_H */