Skip to content

Commit 7e59e89

Browse files
committed
Fix overriding of print to be compatible to stdlib again
1 parent 18b9775 commit 7e59e89

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Sha/sha1.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include <string.h>
2-
#include <avr/io.h>
3-
#include <avr/pgmspace.h>
42
#include "sha1.h"
53

64
#define SHA1_K0 0x5a827999
@@ -72,9 +70,10 @@ void Sha1Class::addUncounted(uint8_t data) {
7270
}
7371
}
7472

75-
void Sha1Class::write(uint8_t data) {
73+
size_t Sha1Class::write(uint8_t data) {
7674
++byteCount;
7775
addUncounted(data);
76+
return 1;
7877
}
7978

8079
void Sha1Class::pad() {

Sha/sha1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Sha1Class : public Print
2323
void initHmac(const uint8_t* secret, int secretLength);
2424
uint8_t* result(void);
2525
uint8_t* resultHmac(void);
26-
virtual void write(uint8_t);
26+
virtual size_t write(uint8_t);
2727
using Print::write;
2828
private:
2929
void pad();

Sha/sha256.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include <string.h>
2-
#include <avr/io.h>
3-
#include <avr/pgmspace.h>
42
#include "sha256.h"
53

64
uint32_t sha256K[] PROGMEM = {
@@ -87,9 +85,10 @@ void Sha256Class::addUncounted(uint8_t data) {
8785
}
8886
}
8987

90-
void Sha256Class::write(uint8_t data) {
88+
size_t Sha256Class::write(uint8_t data) {
9189
++byteCount;
9290
addUncounted(data);
91+
return 1;
9392
}
9493

9594
void Sha256Class::pad() {

Sha/sha256.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Sha256Class : public Print
2323
void initHmac(const uint8_t* secret, int secretLength);
2424
uint8_t* result(void);
2525
uint8_t* resultHmac(void);
26-
virtual void write(uint8_t);
26+
size_t void write(uint8_t);
2727
using Print::write;
2828
private:
2929
void pad();

0 commit comments

Comments
 (0)