Skip to content

Commit 29d8c63

Browse files
Make certain hash bits constant
1 parent 882e546 commit 29d8c63

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

cores/esp8266/Updater.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ class UpdaterHashClass {
3636
virtual void add(const void *data, uint32_t len) = 0;
3737
virtual void end() = 0;
3838
virtual int len() = 0;
39-
virtual void *hash() = 0;
39+
virtual const void *hash() = 0;
4040
};
4141

4242
// Abstract class to implement a signature verifier
4343
class UpdaterVerifyClass {
4444
public:
4545
virtual uint32_t length() = 0; // How many bytes of signature are expected
46-
virtual bool verify(UpdaterHashClass *hash, void *signature, uint32_t signatureLen) = 0; // Verify, return "true" on success
46+
virtual bool verify(UpdaterHashClass *hash, const void *signature, uint32_t signatureLen) = 0; // Verify, return "true" on success
4747
};
4848

4949
class UpdaterClass {

libraries/ESP8266WiFi/src/BearSSLHelpers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,8 @@ int BearSSLHashSHA256::len() {
839839
return sizeof(_sha256);
840840
}
841841

842-
void *BearSSLHashSHA256::hash() {
843-
return (void*) _sha256;
842+
const void *BearSSLHashSHA256::hash() {
843+
return (const void*) _sha256;
844844
}
845845

846846
// SHA256 verifier
@@ -857,7 +857,7 @@ uint32_t BearSSLSigningVerifier::length()
857857
}
858858
}
859859

860-
bool BearSSLSigningVerifier::verify(UpdaterHashClass *hash, void *signature, uint32_t signatureLen) {
860+
bool BearSSLSigningVerifier::verify(UpdaterHashClass *hash, const void *signature, uint32_t signatureLen) {
861861
if (!_pubKey || !hash || !signature || signatureLen != length()) return false;
862862

863863
if (_pubKey->isRSA()) {

libraries/ESP8266WiFi/src/BearSSLHelpers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class BearSSLHashSHA256 : public UpdaterHashClass {
146146
virtual void add(const void *data, uint32_t len) override;
147147
virtual void end() override;
148148
virtual int len() override;
149-
virtual void *hash() override;
149+
virtual const void *hash() override;
150150
private:
151151
br_sha256_context _cc;
152152
unsigned char _sha256[32];
@@ -155,7 +155,7 @@ class BearSSLHashSHA256 : public UpdaterHashClass {
155155
class BearSSLSigningVerifier : public UpdaterVerifyClass {
156156
public:
157157
virtual uint32_t length() override;
158-
virtual bool verify(UpdaterHashClass *hash, void *signature, uint32_t signatureLen) override;
158+
virtual bool verify(UpdaterHashClass *hash, const void *signature, uint32_t signatureLen) override;
159159

160160
public:
161161
BearSSLSigningVerifier(BearSSLPublicKey *pubKey) { _pubKey = pubKey; }

0 commit comments

Comments
 (0)