Skip to content

Arduino 1.0 support (untested) #1

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

Open
jkiv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Arduino 1.0 support (untested) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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 Sha/sha1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,17 @@ void Sha1Class::addUncounted(uint8_t data) {
}
}

void Sha1Class::write(uint8_t data) {
#if defined(ARDUINO) && ARDUINO >= 100
size_t
#else
void
#endif
Sha1Class::write(uint8_t data) {
++byteCount;
addUncounted(data);
#if defined(ARDUINO) && ARDUINO >= 100
return 1;
#endif
}

void Sha1Class::pad() {
Expand Down
4 changes: 4 additions & 0 deletions Sha/sha1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class Sha1Class : public Print
void initHmac(const uint8_t* secret, int secretLength);
uint8_t* result(void);
uint8_t* resultHmac(void);
#if defined(ARDUINO) && ARDUINO >= 100
virtual size_t write(uint8_t);
#else
virtual void write(uint8_t);
#endif
using Print::write;
private:
void pad();
Expand Down
10 changes: 9 additions & 1 deletion Sha/sha256.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,17 @@ void Sha256Class::addUncounted(uint8_t data) {
}
}

void Sha256Class::write(uint8_t data) {
#if defined(ARDUINO) && ARDUINO >= 100
size_t
#else
void
#endif
Sha256Class::write(uint8_t data) {
++byteCount;
addUncounted(data);
#if defined(ARDUINO) && ARDUINO >= 100
return 1;
#endif
}

void Sha256Class::pad() {
Expand Down
4 changes: 4 additions & 0 deletions Sha/sha256.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class Sha256Class : public Print
void initHmac(const uint8_t* secret, int secretLength);
uint8_t* result(void);
uint8_t* resultHmac(void);
#if defined(ARDUINO) && ARDUINO >= 100
virtual size_t write(uint8_t);
#else
virtual void write(uint8_t);
#endif
using Print::write;
private:
void pad();
Expand Down