Skip to content

Commit f356526

Browse files
committed
Namespace BearSSL in core "feels" wrong - using catch-all esp8266 instead.
1 parent a1843c8 commit f356526

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

cores/esp8266/Updater.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#endif
1111

1212
#if ARDUINO_SIGNING
13-
namespace BearSSL {
13+
namespace esp8266 {
1414
extern UpdaterHashClass& hash;
1515
extern UpdaterVerifyClass& sign;
1616
}
@@ -38,7 +38,7 @@ UpdaterClass::UpdaterClass()
3838
, _progress_callback(nullptr)
3939
{
4040
#if ARDUINO_SIGNING
41-
installSignature(&BearSSL::hash, &BearSSL::sign);
41+
installSignature(&esp8266::hash, &esp8266::sign);
4242
#endif
4343
}
4444

libraries/ESP8266WiFi/src/BearSSLHelpers.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,18 @@ make_stack_thunk(br_ssl_engine_sendrec_buf);
904904

905905
#endif
906906

907+
};
908+
907909
#if ARDUINO_SIGNING
908-
static PublicKey signPubKey(signing_pubkey);
909-
static HashSHA256 __hash;
910-
static SigningVerifier __sign(&signPubKey);
910+
namespace {
911+
static BearSSL::PublicKey signPubKey(signing_pubkey);
912+
static BearSSL::HashSHA256 __hash;
913+
static BearSSL::SigningVerifier __sign(&signPubKey);
914+
};
911915

912-
UpdaterHashClass& hash = __hash;
913-
UpdaterVerifyClass& sign = __sign;
916+
namespace esp8266 {
917+
UpdaterHashClass& hash = __hash;
918+
UpdaterVerifyClass& sign = __sign;
919+
};
914920
#endif
915921

916-
};

0 commit comments

Comments
 (0)