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

Fix compile error on Arduino IDE 1.6.0 #8

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

Fix compile error on Arduino IDE 1.6.0 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
555de05
Fix compile error at Arduino IDE 1.6.0
toruuetani Feb 27, 2015
f2145b6
Fix compile error by conflict type.
toruuetani Feb 27, 2015
41e84a4
Fix compile error by not const.
toruuetani Feb 27, 2015
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
16 changes: 12 additions & 4 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,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 All @@ -99,7 +107,7 @@ void Sha1Class::pad() {
uint8_t* Sha1Class::result(void) {
// Pad to complete the last block
pad();

// Swap byte order back
for (int i=0; i<5; i++) {
uint32_t a,b;
Expand All @@ -110,7 +118,7 @@ uint8_t* Sha1Class::result(void) {
b|=a>>24;
state.w[i]=b;
}

// Return pointer to hash (20 characters)
return state.b;
}
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);
#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 All @@ -36,7 +40,7 @@ class Sha1Class : public Print
uint32_t byteCount;
uint8_t keyBuffer[BLOCK_LENGTH];
uint8_t innerHash[HASH_LENGTH];

};
extern Sha1Class Sha1;

Expand Down
20 changes: 14 additions & 6 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 @@ -49,7 +49,7 @@ void Sha256Class::hashBlock() {
f=state.w[5];
g=state.w[6];
h=state.w[7];

for (i=0; i<64; i++) {
if (i>=16) {
t1 = buffer.w[i&15] + buffer.w[(i-7)&15];
Expand Down 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 All @@ -114,7 +122,7 @@ void Sha256Class::pad() {
uint8_t* Sha256Class::result(void) {
// Pad to complete the last block
pad();

// Swap byte order back
for (int i=0; i<8; i++) {
uint32_t a,b;
Expand All @@ -125,7 +133,7 @@ uint8_t* Sha256Class::result(void) {
b|=a>>24;
state.w[i]=b;
}

// Return pointer to hash (20 characters)
return state.b;
}
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