Make the Crypto examples work for ESP8266

libraries/Crypto/examples/TestAES/TestAES.ino

@@ -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();

libraries/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino

@@ -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

libraries/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino

@@ -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

libraries/Crypto/examples/TestChaCha/TestChaCha.ino

@@ -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

libraries/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino

@@ -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
 

libraries/Crypto/examples/TestEAX/TestEAX.ino

@@ -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;
 

libraries/Crypto/examples/TestGCM/TestGCM.ino

@@ -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;
 

libraries/Crypto/examples/TestP521/TestP521.ino

@@ -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)
 {

libraries/Crypto/examples/TestSpeck/TestSpeck.ino

@@ -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();

libraries/Crypto/examples/TestXTS/TestXTS.ino

@@ -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);