Skip to content

Allow users to inherit and override CertStore #7827

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 13 commits into from
Jan 18, 2021
Merged

Allow users to inherit and override CertStore #7827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9b5e5d5
Make installCertStore virtual so we can inherit from CertStore and ov…
paulocsanz Jan 17, 2021
b18e058
Make CertStore destructor virtual
paulocsanz Jan 17, 2021
e80c158
Create CertStoreBase to inherit from
paulocsanz Jan 18, 2021
58613ae
Update _certStorage type
paulocsanz Jan 18, 2021
456655e
Fix typo
paulocsanz Jan 18, 2021
c4a5c09
Provide setCertStore for the default implementation
paulocsanz Jan 18, 2021
5101586
Set virtual method to 0
paulocsanz Jan 18, 2021
5697fce
Remove useless method
paulocsanz Jan 18, 2021
ad15acf
Fix missing ;
paulocsanz Jan 18, 2021
8f5e7e9
Remove virtual destructor
paulocsanz Jan 18, 2021
c941ace
Re-add CertStoreBase virtual destructor
paulocsanz Jan 18, 2021
77d995b
Fix typo
paulocsanz Jan 18, 2021
474c6df
Merge branch 'master' into master
paulocsanz Jan 18, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion libraries/ESP8266WiFi/src/CertStoreBearSSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,15 @@

namespace BearSSL {

class CertStore {
class CertStoreBase {
public:
virtual ~CertStoreBase() {}

// Installs the cert store into the X509 decoder (normally via static function callbacks)
virtual void installCertStore(br_x509_minimal_context *ctx) = 0;
};

class CertStore: public CertStoreBase {
public:
CertStore() { };
~CertStore();
Expand Down
6 changes: 3 additions & 3 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class WiFiClientSecureCtx : public WiFiClient {
int getLastSSLError(char *dest = NULL, size_t len = 0);

// Attach a preconfigured certificate store
void setCertStore(CertStore *certStore) {
void setCertStore(CertStoreBase *certStore) {
_certStore = certStore;
}

Expand Down Expand Up @@ -140,7 +140,7 @@ class WiFiClientSecureCtx : public WiFiClient {
std::shared_ptr<unsigned char> _iobuf_out;
time_t _now;
const X509List *_ta;
CertStore *_certStore;
CertStoreBase *_certStore;
int _iobuf_in_size;
int _iobuf_out_size;
bool _handshake_done;
Expand Down Expand Up @@ -274,7 +274,7 @@ class WiFiClientSecure : public WiFiClient {
int getLastSSLError(char *dest = NULL, size_t len = 0) { return _ctx->getLastSSLError(dest, len); }

// Attach a preconfigured certificate store
void setCertStore(CertStore *certStore) { _ctx->setCertStore(certStore); }
void setCertStore(CertStoreBase *certStore) { _ctx->setCertStore(certStore); }

// Select specific ciphers (i.e. optimize for speed over security)
// These may be in PROGMEM or RAM, either will run properly
Expand Down