Merge branch 'master' into bug-esp8266#3795

Author: tablatronix

cores/esp8266/Arduino.h

@@ -178,7 +178,7 @@ void ets_intr_unlock();
 #define _NOP() do { __asm__ volatile ("nop"); } while (0)
 #endif
 
-typedef unsigned int word;
+typedef uint16_t word;
 
 #define bit(b) (1UL << (b))
 #define _BV(b) (1UL << (b))

cores/esp8266/Schedule.cpp

@@ -14,26 +14,6 @@ static scheduled_fn_t* sLastUnused = 0;
 
 static int sCount = 0;
 
-static void init_lists() __attribute__((unused));
-static void init_lists()
-{
-    if (sCount != 0) {
-        return;
-    }
-    while (sCount < SCHEDULED_FN_INITIAL_COUNT) {
-        scheduled_fn_t* it = new scheduled_fn_t;
-        if (sCount == 0) {
-            sFirstUnused = it;
-        }
-        else {
-            sLastUnused->mNext = it;
-        }
-        sLastUnused = it;
-        ++sCount;
-    }
-    sLastUnused->mNext = NULL;
-}
-
 static scheduled_fn_t* get_fn() {
     scheduled_fn_t* result = NULL;
     // try to get an item from unused items list

cores/esp8266/WString.cpp

@@ -477,6 +477,33 @@ unsigned char String::equalsIgnoreCase(const String &s2) const {
     return 1;
 }
 
+unsigned char String::equalsConstantTime(const String &s2) const {
+    // To avoid possible time-based attacks present function
+    // compares given strings in a constant time.
+    if(len != s2.len)
+        return 0;
+    //at this point lengths are the same
+    if(len == 0)
+        return 1;
+    //at this point lenghts are the same and non-zero
+    const char *p1 = buffer;
+    const char *p2 = s2.buffer;
+    unsigned int equalchars = 0;
+    unsigned int diffchars = 0;
+    while(*p1) {
+        if(*p1 == *p2)
+            ++equalchars;
+        else
+            ++diffchars;
+        ++p1;
+        ++p2;
+    }
+    //the following should force a constant time eval of the condition without a compiler "logical shortcut"
+    unsigned char equalcond = (equalchars == len);
+    unsigned char diffcond = (diffchars == 0);
+    return (equalcond & diffcond); //bitwise AND
+}
+
 unsigned char String::startsWith(const String &s2) const {
     if(len < s2.len)
         return 0;

cores/esp8266/WString.h

@@ -194,6 +194,7 @@ class String {
         unsigned char operator <=(const String &rhs) const;
         unsigned char operator >=(const String &rhs) const;
         unsigned char equalsIgnoreCase(const String &s) const;
+        unsigned char equalsConstantTime(const String &s) const;
         unsigned char startsWith(const String &prefix) const;
         unsigned char startsWith(const String &prefix, unsigned int offset) const;
         unsigned char endsWith(const String &suffix) const;

cores/esp8266/coredecls.h

@@ -0,0 +1,9 @@
+
+#ifndef __COREDECLS_H
+#define __COREDECLS_H
+
+extern bool s_bootTimeSet;
+
+// TODO: put declarations here, get rid of -Wno-implicit-function-declaration
+
+#endif // __COREDECLS_H