Skip to content
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

Jump to bottom

Updated for newer IDE #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated for newer IDE #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6e9d9e
Updated 'sha1InitState' and function 'write'
dybm Oct 6, 2016
fecfa17
Updated function 'write'
dybm Oct 6, 2016
61c9450
Updated PROGMEM vars and function 'write'
dybm Oct 6, 2016
8490f1b
Updated function 'write'
dybm Oct 6, 2016
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
12 changes: 10 additions & 2 deletions Sha/sha1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define SHA1_K40 0x8f1bbcdc
#define SHA1_K60 0xca62c1d6

uint8_t sha1InitState[] PROGMEM = {
const uint8_t sha1InitState[] PROGMEM = {
0x01,0x23,0x45,0x67, // H0
0x89,0xab,0xcd,0xef, // H1
0xfe,0xdc,0xba,0x98, // H2
Expand Down Expand Up @@ -72,10 +72,18 @@ void Sha1Class::addUncounted(uint8_t data) {
}
}

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

void Sha1Class::pad() {
// Implement SHA-1 padding (fips180-2 §5.1.1)
Expand Down
6 changes: 5 additions & 1 deletion 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);
virtual void write(uint8_t);
#if ARDUINO >= 100
virtual size_t write(uint8_t);
#else
virtual void write(uint8_t);
#endif
using Print::write;
private:
void pad();
Expand Down
14 changes: 11 additions & 3 deletions Sha/sha256.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <avr/pgmspace.h>
#include "sha256.h"

uint32_t sha256K[] PROGMEM = {
const uint32_t sha256K[] PROGMEM = {
0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
Expand All @@ -16,7 +16,7 @@ uint32_t sha256K[] PROGMEM = {

#define BUFFER_SIZE 64

uint8_t sha256InitState[] PROGMEM = {
const uint8_t sha256InitState[] PROGMEM = {
0x67,0xe6,0x09,0x6a, // H0
0x85,0xae,0x67,0xbb, // H1
0x72,0xf3,0x6e,0x3c, // H2
Expand Down Expand Up @@ -87,10 +87,18 @@ void Sha256Class::addUncounted(uint8_t data) {
}
}

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

void Sha256Class::pad() {
// Implement SHA-256 padding (fips180-2 §5.1.1)
Expand Down
6 changes: 5 additions & 1 deletion 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);
virtual void write(uint8_t);
#if ARDUINO >= 100
virtual size_t write(uint8_t);
#else
virtual void write(uint8_t);
#endif
using Print::write;
private:
void pad();
Expand Down