From 661c7075b77ee65b7215cb421a3a0fdbe24c7308 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 18:57:42 +0200
Subject: [PATCH 1/7] add Hash library currently supports SHA1

---
 libraries/Hash/examples/sha1.ino  |  26 ++++
 libraries/Hash/library.properties |   8 ++
 libraries/Hash/src/hash.cpp       |  71 ++++++++++
 libraries/Hash/src/hash.h         |  33 +++++
 libraries/Hash/src/sha1/sha1.c    | 208 ++++++++++++++++++++++++++++++
 libraries/Hash/src/sha1/sha1.h    |  32 +++++
 6 files changed, 378 insertions(+)
 create mode 100644 libraries/Hash/examples/sha1.ino
 create mode 100644 libraries/Hash/library.properties
 create mode 100644 libraries/Hash/src/hash.cpp
 create mode 100644 libraries/Hash/src/hash.h
 create mode 100644 libraries/Hash/src/sha1/sha1.c
 create mode 100644 libraries/Hash/src/sha1/sha1.h

diff --git a/libraries/Hash/examples/sha1.ino b/libraries/Hash/examples/sha1.ino
new file mode 100644
index 000000000..c19a585c0
--- /dev/null
+++ b/libraries/Hash/examples/sha1.ino
@@ -0,0 +1,26 @@
+/**
+ * simple demo to show sha1 calculation
+ */
+#include <Arduino.h>
+#include <hash.h>
+
+void setup() {
+    Serial.begin(921600);
+}
+
+void loop() {
+    uint8_t hash[20];
+    const uint8_t test[] = "test";
+
+    sha1((uint8_t *)&test[0], sizeof(test)-1, &hash[0]);
+
+    // SHA1: A94A8FE5CCB19BA61C4C0873D391E987982FBBD3
+    Serial.print("SHA1:");
+    for(uint16_t i = 0; i < 20; i++) {
+        Serial.printf("%02X", hash[i]);
+    }
+    Serial.println();
+
+    delay(1000);
+}
+
diff --git a/libraries/Hash/library.properties b/libraries/Hash/library.properties
new file mode 100644
index 000000000..3848b1f95
--- /dev/null
+++ b/libraries/Hash/library.properties
@@ -0,0 +1,8 @@
+name=Hash
+version=1.0
+author=Markus Sattler
+maintainer=Markus Sattler 
+sentence=Generate Hash from data
+paragraph=
+url=
+architectures=esp8266
diff --git a/libraries/Hash/src/hash.cpp b/libraries/Hash/src/hash.cpp
new file mode 100644
index 000000000..5a792a38e
--- /dev/null
+++ b/libraries/Hash/src/hash.cpp
@@ -0,0 +1,71 @@
+/**
+ * @file hash.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the esp8266 core for Arduino environment.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <Arduino.h>
+
+#include "hash.h"
+
+extern "C" {
+    #include "sha1/sha1.h"
+}
+
+/**
+ * create a sha1 hash from data
+ * @param data uint8_t *
+ * @param size uint32_t
+ * @param hash uint8_t[20]
+ */
+void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]) {
+
+    SHA1_CTX ctx;
+
+#ifdef DEBUG_SHA1
+    os_printf("DATA:");
+    for(uint16_t i = 0; i < size; i++) {
+        os_printf("%02X", data[i]);
+    }
+    os_printf("\n");
+    os_printf("DATA:");
+    for(uint16_t i = 0; i < size; i++) {
+        os_printf("%c", data[i]);
+    }
+    os_printf("\n");
+#endif
+
+    SHA1Init(&ctx);
+    SHA1Update(&ctx, data, size);
+    SHA1Final(hash, &ctx);
+
+#ifdef DEBUG_SHA1
+    os_printf("SHA1:");
+    for(uint16_t i = 0; i < 20; i++) {
+        os_printf("%02X", hash[i]);
+    }
+    os_printf("\n\n");
+#endif
+}
+
+void sha1(const uint8_t * data, uint32_t size, uint8_t hash[20]) {
+    sha1((uint8_t *) data, size, hash);
+}
diff --git a/libraries/Hash/src/hash.h b/libraries/Hash/src/hash.h
new file mode 100644
index 000000000..2984c4bc1
--- /dev/null
+++ b/libraries/Hash/src/hash.h
@@ -0,0 +1,33 @@
+/**
+ * @file hash.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the esp8266 core for Arduino environment.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef HASH_H_
+#define HASH_H_
+
+//#define DEBUG_SHA1
+
+void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]);
+void sha1(const uint8_t * data, uint32_t size, uint8_t hash[20]);
+
+#endif /* HASH_H_ */
diff --git a/libraries/Hash/src/sha1/sha1.c b/libraries/Hash/src/sha1/sha1.c
new file mode 100644
index 000000000..fae926462
--- /dev/null
+++ b/libraries/Hash/src/sha1/sha1.c
@@ -0,0 +1,208 @@
+/**
+ * @file sha1.c
+ * @date 20.05.2015
+ * @author Steve Reid <steve@edmweb.com>
+ *
+ * from: http://www.virtualbox.org/svn/vbox/trunk/src/recompiler/tests/sha1.c
+ */
+
+/* from valgrind tests */
+
+/* ================ sha1.c ================ */
+/*
+    SHA-1 in C
+    By Steve Reid <steve@edmweb.com>
+    100% Public Domain
+
+    Test Vectors (from FIPS PUB 180-1)
+    "abc"
+      A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+      84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+    A million repetitions of "a"
+      34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#define SHA1HANDSOFF
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <c_types.h>
+
+#include "sha1.h"
+
+//#include <endian.h>
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#elif BYTE_ORDER == BIG_ENDIAN
+#define blk0(i) block->l[i]
+#else
+#error "Endianness not defined!"
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+void ICACHE_FLASH_ATTR SHA1Transform(uint32_t state[5], uint8_t buffer[64])
+{
+uint32_t a, b, c, d, e;
+typedef union {
+    unsigned char c[64];
+    uint32_t l[16];
+} CHAR64LONG16;
+#ifdef SHA1HANDSOFF
+CHAR64LONG16 block[1];  /* use array to appear as a pointer */
+    memcpy(block, buffer, 64);
+#else
+    /* The following had better never be used because it causes the
+     * pointer-to-const buffer to be cast into a pointer to non-const.
+     * And the result is written through.  I threw a "const" in, hoping
+     * this will cause a diagnostic.
+     */
+CHAR64LONG16* block = (const CHAR64LONG16*)buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+#ifdef SHA1HANDSOFF
+    memset(block, '\0', sizeof(block));
+#endif
+}
+
+
+/* SHA1Init - Initialize new context */
+
+void ICACHE_FLASH_ATTR SHA1Init(SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void ICACHE_FLASH_ATTR SHA1Update(SHA1_CTX* context, uint8_t* data, uint32_t len)
+{
+    uint32_t i;
+    uint32_t j;
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+    context->count[1]++;
+    context->count[1] += (len>>29);
+    j = (j >> 3) & 63;
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+void ICACHE_FLASH_ATTR SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+{
+unsigned i;
+unsigned char finalcount[8];
+unsigned char c;
+
+#if 0   /* untested "improvement" by DHR */
+    /* Convert context->count to a sequence of bytes
+     * in finalcount.  Second element first, but
+     * big-endian order within element.
+     * But we do it all backwards.
+     */
+    unsigned char *fcp = &finalcount[8];
+
+    for (i = 0; i < 2; i++)
+    {
+    uint32_t t = context->count[i];
+    int j;
+
+    for (j = 0; j < 4; t >>= 8, j++)
+        *--fcp = (unsigned char) t;
+    }
+#else
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+#endif
+    c = 0200;
+    SHA1Update(context, &c, 1);
+    while ((context->count[0] & 504) != 448) {
+    c = 0000;
+        SHA1Update(context, &c, 1);
+    }
+    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+    for (i = 0; i < 20; i++) {
+        digest[i] = (unsigned char)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    memset(context, '\0', sizeof(*context));
+    memset(&finalcount, '\0', sizeof(finalcount));
+}
+/* ================ end of sha1.c ================ */
diff --git a/libraries/Hash/src/sha1/sha1.h b/libraries/Hash/src/sha1/sha1.h
new file mode 100644
index 000000000..158bd76b3
--- /dev/null
+++ b/libraries/Hash/src/sha1/sha1.h
@@ -0,0 +1,32 @@
+/**
+ * @file sha1.h
+ * @date 20.05.2015
+ * @author Steve Reid <steve@edmweb.com>
+ *
+ * from: http://www.virtualbox.org/svn/vbox/trunk/src/recompiler/tests/sha1.c
+ */
+
+/* ================ sha1.h ================ */
+/*
+    SHA-1 in C
+    By Steve Reid <steve@edmweb.com>
+    100% Public Domain
+*/
+
+#ifndef SHA1_H_
+#define SHA1_H_
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+void SHA1Transform(uint32_t state[5], uint8_t buffer[64]);
+void SHA1Init(SHA1_CTX* context);
+void SHA1Update(SHA1_CTX* context, uint8_t* data, uint32_t len);
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+
+#endif /* SHA1_H_ */
+
+/* ================ end of sha1.h ================ */

From 94850752b80b999236f36845bccee46d85c28b74 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 18:58:06 +0200
Subject: [PATCH 2/7] add some return headers to WebServer

---
 libraries/ESP8266WebServer/src/ESP8266WebServer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
index 054929971..b96043772 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -251,7 +251,9 @@ void ESP8266WebServer::_handleRequest() {
 
 const char* ESP8266WebServer::_responseCodeToString(int code) {
   switch (code) {
+    case 101: return "Switching Protocols";
     case 200: return "OK";
+    case 403: return "Forbidden";
     case 404: return "Not found";
     case 500: return "Fail";
     default:  return "";

From 4b1c99af4445a804f21f7858531a8b14eca914fc Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 19:08:21 +0200
Subject: [PATCH 3/7] the sha1 functions are part of the SDK so remove sha1.c

---
 libraries/Hash/src/{hash.cpp => Hash.cpp} | 4 ++--
 libraries/Hash/src/{hash.h => Hash.h}     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/Hash/src/{hash.cpp => Hash.cpp} (94%)
 rename libraries/Hash/src/{hash.h => Hash.h} (95%)

diff --git a/libraries/Hash/src/hash.cpp b/libraries/Hash/src/Hash.cpp
similarity index 94%
rename from libraries/Hash/src/hash.cpp
rename to libraries/Hash/src/Hash.cpp
index 5a792a38e..66de178c0 100644
--- a/libraries/Hash/src/hash.cpp
+++ b/libraries/Hash/src/Hash.cpp
@@ -1,5 +1,5 @@
 /**
- * @file hash.cpp
+ * @file Hash.cpp
  * @date 20.05.2015
  * @author Markus Sattler
  *
@@ -24,7 +24,7 @@
 
 #include <Arduino.h>
 
-#include "hash.h"
+#include "Hash.h"
 
 extern "C" {
     #include "sha1/sha1.h"
diff --git a/libraries/Hash/src/hash.h b/libraries/Hash/src/Hash.h
similarity index 95%
rename from libraries/Hash/src/hash.h
rename to libraries/Hash/src/Hash.h
index 2984c4bc1..1fe6d1e71 100644
--- a/libraries/Hash/src/hash.h
+++ b/libraries/Hash/src/Hash.h
@@ -1,5 +1,5 @@
 /**
- * @file hash.h
+ * @file Hash.h
  * @date 20.05.2015
  * @author Markus Sattler
  *

From 495e21d53eda33d90a72d1ae910182deacfa89dc Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 19:20:17 +0200
Subject: [PATCH 4/7] missed rename

---
 libraries/Hash/examples/sha1.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Hash/examples/sha1.ino b/libraries/Hash/examples/sha1.ino
index c19a585c0..678416340 100644
--- a/libraries/Hash/examples/sha1.ino
+++ b/libraries/Hash/examples/sha1.ino
@@ -2,7 +2,7 @@
  * simple demo to show sha1 calculation
  */
 #include <Arduino.h>
-#include <hash.h>
+#include <Hash.h>
 
 void setup() {
     Serial.begin(921600);

From 4b786d0df69581cfd83eb86554cf57b3067308d9 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 19:41:40 +0200
Subject: [PATCH 5/7] add more functions to handle sha1 in differed cases

---
 libraries/Hash/examples/sha1.ino | 16 +++++++----
 libraries/Hash/src/Hash.cpp      | 48 +++++++++++++++++++++++++++++++-
 libraries/Hash/src/Hash.h        |  9 ++++++
 3 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/libraries/Hash/examples/sha1.ino b/libraries/Hash/examples/sha1.ino
index 678416340..75cb8443d 100644
--- a/libraries/Hash/examples/sha1.ino
+++ b/libraries/Hash/examples/sha1.ino
@@ -9,15 +9,21 @@ void setup() {
 }
 
 void loop() {
+
+    // usage as String
+    // SHA1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3
+
+    Serial.print("SHA1:");
+    Serial.println(sha1("abc"));
+
+    // usage as ptr
+    // SHA1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3
     uint8_t hash[20];
-    const uint8_t test[] = "test";
+    sha1("abc", &hash[0]);
 
-    sha1((uint8_t *)&test[0], sizeof(test)-1, &hash[0]);
-
-    // SHA1: A94A8FE5CCB19BA61C4C0873D391E987982FBBD3
     Serial.print("SHA1:");
     for(uint16_t i = 0; i < 20; i++) {
-        Serial.printf("%02X", hash[i]);
+        Serial.printf("%02x", hash[i]);
     }
     Serial.println();
 
diff --git a/libraries/Hash/src/Hash.cpp b/libraries/Hash/src/Hash.cpp
index 66de178c0..5a58c961d 100644
--- a/libraries/Hash/src/Hash.cpp
+++ b/libraries/Hash/src/Hash.cpp
@@ -27,7 +27,7 @@
 #include "Hash.h"
 
 extern "C" {
-    #include "sha1/sha1.h"
+#include "sha1/sha1.h"
 }
 
 /**
@@ -66,6 +66,52 @@ void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]) {
 #endif
 }
 
+void sha1(char * data, uint32_t size, uint8_t hash[20]) {
+    sha1((uint8_t *) data, size, hash);
+}
+
 void sha1(const uint8_t * data, uint32_t size, uint8_t hash[20]) {
     sha1((uint8_t *) data, size, hash);
 }
+
+void sha1(const char * data, uint32_t size, uint8_t hash[20]) {
+    sha1((uint8_t *) data, size, hash);
+}
+
+void sha1(String data, uint8_t hash[20]) {
+    sha1(data.c_str(), data.length(), hash);
+}
+
+String sha1(uint8_t* data, uint32_t size) {
+    uint8_t hash[20];
+    String hashStr = "";
+
+    sha1(&data[0], size, &hash[0]);
+
+    for(uint16_t i = 0; i < 20; i++) {
+        String hex = String(hash[i], HEX);
+        if(hex.length() < 2) {
+            hex = "0" + hex;
+        }
+        hashStr += hex;
+    }
+
+    return hashStr;
+}
+
+String sha1(char* data, uint32_t size) {
+    return sha1((uint8_t*) data, size);
+}
+
+String sha1(const uint8_t* data, uint32_t size) {
+    return sha1((uint8_t*) data, size);
+}
+
+String sha1(const char* data, uint32_t size) {
+    return sha1((uint8_t*) data, size);
+}
+
+String sha1(String data) {
+    return sha1(data.c_str(), data.length());
+}
+
diff --git a/libraries/Hash/src/Hash.h b/libraries/Hash/src/Hash.h
index 1fe6d1e71..6af5e79ef 100644
--- a/libraries/Hash/src/Hash.h
+++ b/libraries/Hash/src/Hash.h
@@ -28,6 +28,15 @@
 //#define DEBUG_SHA1
 
 void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]);
+void sha1(char * data, uint32_t size, uint8_t hash[20]);
 void sha1(const uint8_t * data, uint32_t size, uint8_t hash[20]);
+void sha1(const char * data, uint32_t size, uint8_t hash[20]);
+void sha1(String data , uint8_t hash[20]);
+
+String sha1(uint8_t* data, uint32_t size);
+String sha1(char* data, uint32_t size);
+String sha1(uint8_t* data, uint32_t size);
+String sha1(const char* data, uint32_t size);
+String sha1(String data);
 
 #endif /* HASH_H_ */

From a0b1dff5421f561011ffe1a2bf74932fa59e69af Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 19:48:24 +0200
Subject: [PATCH 6/7] code style

---
 libraries/Hash/src/Hash.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Hash/src/Hash.h b/libraries/Hash/src/Hash.h
index 6af5e79ef..d774fd6b1 100644
--- a/libraries/Hash/src/Hash.h
+++ b/libraries/Hash/src/Hash.h
@@ -31,7 +31,7 @@ void sha1(uint8_t * data, uint32_t size, uint8_t hash[20]);
 void sha1(char * data, uint32_t size, uint8_t hash[20]);
 void sha1(const uint8_t * data, uint32_t size, uint8_t hash[20]);
 void sha1(const char * data, uint32_t size, uint8_t hash[20]);
-void sha1(String data , uint8_t hash[20]);
+void sha1(String data, uint8_t hash[20]);
 
 String sha1(uint8_t* data, uint32_t size);
 String sha1(char* data, uint32_t size);

From 4015a47b080958f4a958c9f549a2d0116517f06a Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 20 May 2015 20:04:15 +0200
Subject: [PATCH 7/7] add one missing const

---
 libraries/Hash/src/Hash.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Hash/src/Hash.h b/libraries/Hash/src/Hash.h
index d774fd6b1..774b8aad1 100644
--- a/libraries/Hash/src/Hash.h
+++ b/libraries/Hash/src/Hash.h
@@ -35,7 +35,7 @@ void sha1(String data, uint8_t hash[20]);
 
 String sha1(uint8_t* data, uint32_t size);
 String sha1(char* data, uint32_t size);
-String sha1(uint8_t* data, uint32_t size);
+String sha1(const uint8_t* data, uint32_t size);
 String sha1(const char* data, uint32_t size);
 String sha1(String data);