taigrr/arduinolibs
1
0
Fork 0
mirror of https://github.com/taigrr/arduinolibs synced 2025-01-18 04:33:12 -08:00
Code Issues Projects Releases Wiki Activity

Make the Crypto examples work for ESP8266

Browse Source
This commit is contained in:
Rhys Weatherley 2018-04-01 15:58:00 +10:00
parent 990ae0ea37
commit 511cd8f77c
15 changed files with 135 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/Crypto/Crypto.h
View File

@ -36,4 +36,11 @@ inline void clean(T &var)
bool secure_compare(const void *data1, const void *data2, size_t len);
#if defined(ESP8266)
extern "C" void system_soft_wdt_feed(void);
#define crypto_feed_watchdog() system_soft_wdt_feed()
#else
#define crypto_feed_watchdog() do { ; } while (0)
#endif
#endif

1
libraries/Crypto/Curve25519.cpp
View File

@ -934,6 +934,7 @@ void Curve25519::mul(limb_t *result, const limb_t *x, const limb_t *y)
mulNoReduce(temp, x, y);
reduce(result, temp, NUM_LIMBS_256BIT);
strict_clean(temp);
crypto_feed_watchdog();
}
/**

1
libraries/Crypto/P521.cpp
View File

@ -965,6 +965,7 @@ void P521::mul(limb_t *result, const limb_t *x, const limb_t *y)
mulNoReduce(temp, x, y);
reduce(result, temp);
strict_clean(temp);
crypto_feed_watchdog();
}
/**

3
libraries/Crypto/examples/TestAES/TestAES.ino
View File

@ -76,6 +76,7 @@ byte buffer[16];
void testCipher(BlockCipher *cipher, const struct TestVector *test)
{
crypto_feed_watchdog();
Serial.print(test->name);
Serial.print(" Encryption ... ");
cipher->setKey(test->key, cipher->keySize());
@ -100,6 +101,8 @@ void perfCipher(BlockCipher *cipher, const struct TestVector *test)
unsigned long elapsed;
int count;
crypto_feed_watchdog();
Serial.print(test->name);
Serial.print(" Set Key ... ");
start = micros();

4
libraries/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino
View File

@ -27,7 +27,11 @@ This example runs tests on the BLAKE2b implementation to verify correct behaviou
#include <Crypto.h>
#include <BLAKE2b.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define HASH_SIZE 64
#define BLOCK_SIZE 128

4
libraries/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino
View File

@ -27,7 +27,11 @@ This example runs tests on the BLAKE2s implementation to verify correct behaviou
#include <Crypto.h>
#include <BLAKE2s.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define HASH_SIZE 32
#define BLOCK_SIZE 64

4
libraries/Crypto/examples/TestChaCha/TestChaCha.ino
View File

@ -27,7 +27,11 @@ This example runs tests on the ChaCha implementation to verify correct behaviour
#include <Crypto.h>
#include <ChaCha.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define MAX_PLAINTEXT_SIZE 64
#define MAX_CIPHERTEXT_SIZE 64

4
libraries/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino
View File

@ -28,7 +28,11 @@ correct behaviour.
#include <Crypto.h>
#include <ChaChaPoly.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define MAX_PLAINTEXT_LEN 265

16
libraries/Crypto/examples/TestEAX/TestEAX.ino
View File

@ -30,7 +30,11 @@ This example runs tests on the EAX implementation to verify correct behaviour.
#include <Speck.h>
#include <SpeckTiny.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define MAX_PLAINTEXT_LEN 64
@ -244,6 +248,8 @@ bool testCipher_N(AuthenticatedCipher *cipher, const struct TestVector *test, si
size_t posn, len;
uint8_t tag[16];
crypto_feed_watchdog();
cipher->clear();
if (!cipher->setKey(test->key, 16)) {
Serial.print("setKey ");
@ -344,6 +350,8 @@ void perfCipherSetKey(AuthenticatedCipher *cipher, const struct TestVector *test
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -371,6 +379,8 @@ void perfCipherEncrypt(AuthenticatedCipher *cipher, const struct TestVector *tes
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -399,6 +409,8 @@ void perfCipherDecrypt(AuthenticatedCipher *cipher, const struct TestVector *tes
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -427,6 +439,8 @@ void perfCipherAddAuthData(AuthenticatedCipher *cipher, const struct TestVector
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -456,6 +470,8 @@ void perfCipherComputeTag(AuthenticatedCipher *cipher, const struct TestVector *
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;

16
libraries/Crypto/examples/TestGCM/TestGCM.ino
View File

@ -30,7 +30,11 @@ This example runs tests on the GCM implementation to verify correct behaviour.
#include <SpeckTiny.h>
#include <GCM.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
// There isn't enough memory to test both AES and Speck on the Uno,
// so disable Speck testing on AVR platforms unless explicitly enabled.
@ -270,6 +274,8 @@ bool testCipher_N(AuthenticatedCipher *cipher, const struct TestVector *test, si
size_t posn, len;
uint8_t tag[16];
crypto_feed_watchdog();
cipher->clear();
if (!cipher->setKey(test->key, cipher->keySize())) {
Serial.print("setKey ");
@ -367,6 +373,8 @@ void perfCipherSetKey(AuthenticatedCipher *cipher, const struct TestVector *test
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -392,6 +400,8 @@ void perfCipherEncrypt(AuthenticatedCipher *cipher, const struct TestVector *tes
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -418,6 +428,8 @@ void perfCipherDecrypt(AuthenticatedCipher *cipher, const struct TestVector *tes
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -444,6 +456,8 @@ void perfCipherAddAuthData(AuthenticatedCipher *cipher, const struct TestVector
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;
@ -471,6 +485,8 @@ void perfCipherComputeTag(AuthenticatedCipher *cipher, const struct TestVector *
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(TestVector));
test = &testVector;

4
libraries/Crypto/examples/TestP521/TestP521.ino
View File

@ -34,7 +34,11 @@ AVR platforms with 32K or less of flash memory.
#include <RNG.h>
#include <RNG.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
void printNumber(const char *name, const uint8_t *x, size_t len)
{

4
libraries/Crypto/examples/TestSpeck/TestSpeck.ino
View File

@ -78,6 +78,8 @@ byte buffer[16];
void testCipher(BlockCipher *cipher, const struct TestVector *test, size_t keySize, bool decryption = true)
{
crypto_feed_watchdog();
Serial.print(test->name);
Serial.print(" Encryption ... ");
cipher->setKey(test->key, keySize);
@ -105,6 +107,8 @@ void perfCipher(BlockCipher *cipher, const struct TestVector *test, size_t keySi
unsigned long elapsed;
int count;
crypto_feed_watchdog();
Serial.print(test->name);
Serial.print(" Set Key ... ");
start = micros();

14
libraries/Crypto/examples/TestXTS/TestXTS.ino
View File

@ -31,7 +31,11 @@ This example runs tests on the XTS implementation to verify correct behaviour.
#include <SpeckTiny.h>
#include <XTS.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#endif
#define MAX_SECTOR_SIZE 64
@ -207,6 +211,8 @@ void _printProgMem(const char *str)
void testXTS(XTSCommon *cipher, const struct TestVector *test)
{
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(testVector));
Serial.print(testVector.name);
@ -261,6 +267,8 @@ void perfEncrypt(const char *name, XTSCommon *cipher, const struct TestVector *t
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(testVector));
Serial.print(name);
@ -288,6 +296,8 @@ void perfDecrypt(const char *name, XTSCommon *cipher, const struct TestVector *t
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(testVector));
Serial.print(name);
@ -314,6 +324,8 @@ void perfSetKey(const char *name, XTSCommon *cipher, const struct TestVector *te
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(testVector));
Serial.print(name);
@ -337,6 +349,8 @@ void perfSetTweak(const char *name, XTSCommon *cipher, const struct TestVector *
unsigned long elapsed;
int count;
crypto_feed_watchdog();
memcpy_P(&testVector, test, sizeof(testVector));
Serial.print(name);

57
libraries/NewHope/NewHope.cpp
View File

@ -36,7 +36,10 @@ void *operator new(size_t size, void *ptr)
return ptr;
}
#if defined(__AVR__)
#if defined(ESP8266)
#include <pgmspace.h>
#define table_read(name, index) (pgm_read_word(&((name)[(index)])))
#elif defined(__AVR__)
#include <avr/pgmspace.h>
#define table_read(name, index) (pgm_read_word(&((name)[(index)])))
#else
@ -987,9 +990,17 @@ static void poly_getnoise(uint16_t *r, NewHopeChaChaState *chacha, unsigned char
#define INIT_OBJ(type, name) \
type *name = new (state.name##_x) type
#if defined(__AVR__)
#if defined(ESP8266)
// If we try to put the state on the stack, then it causes a stack smash.
// Possibly a system stack size limitation. Allocate the NewHope state on
// the heap instead for ESP8266.
#define NEWHOPE_HEAP_STATE 1
#define NEWHOPE_BYTE_ALIGNED 0
#elif defined(__AVR__)
#define NEWHOPE_HEAP_STATE 0
#define NEWHOPE_BYTE_ALIGNED 1
#else
#define NEWHOPE_HEAP_STATE 0
#define NEWHOPE_BYTE_ALIGNED 0
#endif
@ -1021,7 +1032,7 @@ void NewHope::keygen(uint8_t send[NEWHOPE_SENDABYTES], NewHopePrivateKey &sk,
// We also combine most of the state into a single union, which allows
// us to overlap some of the larger objects and reuse the stack space
// at different points within this function.
union {
typedef union {
struct {
uint16_t a[PARAM_N]; // Value of "a" as a "poly" object.
uint16_t pk[PARAM_N]; // Value of "pk" as a "poly" object.
@ -1031,7 +1042,13 @@ void NewHope::keygen(uint8_t send[NEWHOPE_SENDABYTES], NewHopePrivateKey &sk,
ALLOC_OBJ(SHAKE128, shake); // SHAKE128 object for poly_uniform().
};
ALLOC_OBJ(SHA3_256, sha3); // SHA3 object for hashing the seed.
} state;
} NewHopeKeygenState;
#if NEWHOPE_HEAP_STATE
NewHopeKeygenState *heapState = new NewHopeKeygenState();
#define state (*heapState)
#else
NewHopeKeygenState state;
#endif
// Hide the ChaCha state and the noise seed inside "send".
#if NEWHOPE_BYTE_ALIGNED
@ -1087,6 +1104,10 @@ void NewHope::keygen(uint8_t send[NEWHOPE_SENDABYTES], NewHopePrivateKey &sk,
#endif
#undef noiseseed
#undef chacha
#if NEWHOPE_HEAP_STATE
delete heapState;
#undef state
#endif
}
/**
@ -1202,7 +1223,7 @@ void NewHope::sharedb(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
// We also combine most of the state into a single union, which allows
// us to overlap some of the larger objects and reuse the stack space
// at different points within this function.
union {
typedef union {
struct {
uint16_t a[PARAM_N]; // Value of "a" as a "poly" object.
uint16_t v[PARAM_N]; // Value of "v" as a "poly" object.
@ -1213,7 +1234,13 @@ void NewHope::sharedb(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
ALLOC_OBJ(SHAKE128, shake); // SHAKE128 object for poly_uniform().
};
ALLOC_OBJ(SHA3_256, sha3); // SHA3 object for hashing the result.
} state;
} NewHopeSharedBState;
#if NEWHOPE_HEAP_STATE
NewHopeSharedBState *heapState = new NewHopeSharedBState();
#define state (*heapState)
#else
NewHopeSharedBState state;
#endif
// Hide the ChaCha state and the noise seed inside "send".
// Put them at the end of the "send" buffer in case "received"
@ -1274,6 +1301,10 @@ void NewHope::sharedb(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
#undef noiseseed
#undef chacha
#endif
#if NEWHOPE_HEAP_STATE
delete heapState;
#undef state
#endif
}
/**
@ -1296,7 +1327,7 @@ void NewHope::shareda(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
// We also combine most of the state into a single union, which allows
// us to overlap some of the larger objects and reuse the stack space
// at different points within this function.
union {
typedef union {
struct {
uint16_t v[PARAM_N]; // Value of "v" as a "poly" object.
uint16_t bp[PARAM_N]; // Value of "bp" as a "poly" object.
@ -1306,7 +1337,13 @@ void NewHope::shareda(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
ALLOC_OBJ(NewHopeChaChaState, chacha);
};
ALLOC_OBJ(SHA3_256, sha3); // SHA3 object for hashing the result.
} state;
} NewHopeSharedAState;
#if NEWHOPE_HEAP_STATE
NewHopeSharedAState *heapState = new NewHopeSharedAState();
#define state (*heapState)
#else
NewHopeSharedAState state;
#endif
#if NEWHOPE_SMALL_FOOTPRINT
// Re-create the full private key for Alice from the seed.
@ -1333,4 +1370,8 @@ void NewHope::shareda(uint8_t shared_key[NEWHOPE_SHAREDBYTES],
sha3->finalize(shared_key, 32);
clean(&state, sizeof(state));
#if NEWHOPE_HEAP_STATE
delete heapState;
#undef state
#endif
}

4
libraries/NewHope/examples/TestNewHope/TestNewHope.ino
View File

@ -28,10 +28,14 @@ This example runs tests on the NewHope class to verify correct behaviour.
#include <NewHope.h>
#include <RNG.h>
#include <string.h>
#if defined(ESP8266)
#include <pgmspace.h>
#else
#include <avr/pgmspace.h>
#if !defined(__AVR__)
#define memcmp_P(a,b,c) memcmp((a), (b), (c))
#endif
#endif
// Test vectors that were generated by the reference C implementation.