Skip to content

Commit e7232da

Browse files
committed
After review remarks by @earlephilhower
1 parent f356526 commit e7232da

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cores/esp8266/Updater.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#if ARDUINO_SIGNING
1313
namespace esp8266 {
14-
extern UpdaterHashClass& hash;
15-
extern UpdaterVerifyClass& sign;
14+
extern UpdaterHashClass& updaterSigningHash;
15+
extern UpdaterVerifyClass& updaterSigningVerifier;
1616
}
1717
#endif
1818

@@ -38,7 +38,7 @@ UpdaterClass::UpdaterClass()
3838
, _progress_callback(nullptr)
3939
{
4040
#if ARDUINO_SIGNING
41-
installSignature(&esp8266::hash, &esp8266::sign);
41+
installSignature(&esp8266::updaterSigningHash, &esp8266::updaterSigningVerifier);
4242
#endif
4343
}
4444

libraries/ESP8266WiFi/src/BearSSLHelpers.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -908,14 +908,14 @@ make_stack_thunk(br_ssl_engine_sendrec_buf);
908908

909909
#if ARDUINO_SIGNING
910910
namespace {
911-
static BearSSL::PublicKey signPubKey(signing_pubkey);
912-
static BearSSL::HashSHA256 __hash;
913-
static BearSSL::SigningVerifier __sign(&signPubKey);
911+
static BearSSL::PublicKey signingPubKey(signing_pubkey);
912+
static BearSSL::HashSHA256 __signingHash;
913+
static BearSSL::SigningVerifier __signingVerifier(&signingPubKey);
914914
};
915915

916916
namespace esp8266 {
917-
UpdaterHashClass& hash = __hash;
918-
UpdaterVerifyClass& sign = __sign;
917+
UpdaterHashClass& updaterSigningHash = __signingHash;
918+
UpdaterVerifyClass& updaterSigningVerifier = __signingVerifier;
919919
};
920920
#endif
921921

0 commit comments

Comments
 (0)