diff --git a/Sha/sha1.cpp b/Sha/sha1.cpp
index 9961fbe..1d944d5 100644
--- a/Sha/sha1.cpp
+++ b/Sha/sha1.cpp
@@ -5,7 +5,7 @@
 #define SHA1_K40 0x8f1bbcdc
 #define SHA1_K60 0xca62c1d6
 
-uint8_t sha1InitState[] PROGMEM = {
+static const uint8_t sha1InitState[] PROGMEM = {
   0x01,0x23,0x45,0x67, // H0
   0x89,0xab,0xcd,0xef, // H1
   0xfe,0xdc,0xba,0x98, // H2
@@ -94,7 +94,8 @@ void Sha1Class::pad() {
 }
 
 
-uint8_t* Sha1Class::result(void) {
+void Sha1Class::result(uint8_t* out)
+{
   // Pad to complete the last block
   pad();
   
@@ -109,8 +110,8 @@ uint8_t* Sha1Class::result(void) {
     state.w[i]=b;
   }
   
-  // Return pointer to hash (20 characters)
-  return state.b;
+  // Copy hash result to output buffer
+  memcpy(out, state.b, HASH_LENGTH);
 }
 
 #define HMAC_IPAD 0x36
@@ -135,7 +136,8 @@ void Sha1Class::initHmac(const uint8_t* key, int keyLength) {
   }
 }
 
-uint8_t* Sha1Class::resultHmac(void) {
+void Sha1Class::resultHmac(uint8_t* out)
+{
   uint8_t i;
   // Complete inner hash
   memcpy(innerHash,result(),HASH_LENGTH);
@@ -143,7 +145,8 @@ uint8_t* Sha1Class::resultHmac(void) {
   init();
   for (i=0; i<BLOCK_LENGTH; i++) write(keyBuffer[i] ^ HMAC_OPAD);
   for (i=0; i<HASH_LENGTH; i++) write(innerHash[i]);
-  return result();
+  
+  memcpy(out, state.b, HASH_LENGTH);
 }
 
 #if (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__)
diff --git a/Sha/sha1.h b/Sha/sha1.h
index 81ddbee..03c80b8 100644
--- a/Sha/sha1.h
+++ b/Sha/sha1.h
@@ -2,14 +2,23 @@
 #define Sha1_h
 
 #include <string.h>
-#if  (defined(__linux) || defined(linux)) || defined(__ARDUINO_X86__)
+
+#if !defined(__linux) || !defined(linux)
+	#include "Arduino.h" //To bring in part.h for Energia
+#endif
+
+#if  (defined(__linux) || defined(linux)) || defined(__ARDUINO_X86__) || defined(__TM4C1294NCPDT__)
 	#define memcpy_P memcpy
 	#undef PROGMEM
-	#define PROGMEM __attribute__(( section(".progmem.data") ))
+	#ifndef __TM4C1294NCPDT__
+		#define PROGMEM __attribute__((section(".progmem.data")))
+	#else
+		#define PROGMEM __attribute__((section(".text")))
+	#endif
 	#define pgm_read_dword(p) (*(p))
-	#if defined(__ARDUINO_X86__)
+	#if defined(__ARDUINO_X86__) || defined(__TM4C1294NCPDT__)
 		#include "Print.h"
-	#endif	
+	#endif
 #else
 	#include <avr/io.h>
 	#include <avr/pgmspace.h>
@@ -38,8 +47,8 @@ class Sha1Class : public Print
   public:
     void init(void);
     void initHmac(const uint8_t* secret, int secretLength);
-    uint8_t* result(void);
-    uint8_t* resultHmac(void);
+    void result(uint8_t*);
+    void resultHmac(uint8_t*);
     #if  (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__)
 	virtual size_t write(uint8_t);
 	size_t write_L(const char *str);
diff --git a/Sha/sha256.cpp b/Sha/sha256.cpp
index bf61075..46b7f1f 100644
--- a/Sha/sha256.cpp
+++ b/Sha/sha256.cpp
@@ -1,6 +1,6 @@
 #include "sha256.h"
 
-uint32_t sha256K[] PROGMEM = {
+static 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,
@@ -13,7 +13,7 @@ uint32_t sha256K[] PROGMEM = {
 
 #define BUFFER_SIZE 64
 
-uint8_t sha256InitState[] PROGMEM = {
+static const uint8_t sha256InitState[] PROGMEM = {
   0x67,0xe6,0x09,0x6a, // H0
   0x85,0xae,0x67,0xbb, // H1
   0x72,0xf3,0x6e,0x3c, // H2
@@ -109,7 +109,7 @@ void Sha256Class::pad() {
 }
 
 
-uint8_t* Sha256Class::result(void) {
+void Sha256Class::result(uint8_t* out) {
   // Pad to complete the last block
   pad();
   
@@ -124,8 +124,8 @@ uint8_t* Sha256Class::result(void) {
     state.w[i]=b;
   }
   
-  // Return pointer to hash (20 characters)
-  return state.b;
+  // Copy hash result to output buffer
+  memcpy(out, state.b, HASH_LENGTH);
 }
 
 #define HMAC_IPAD 0x36
@@ -153,7 +153,8 @@ void Sha256Class::initHmac(const uint8_t* key, int keyLength) {
   }
 }
 
-uint8_t* Sha256Class::resultHmac(void) {
+void Sha256Class::resultHmac(uint8_t* out)
+{
   uint8_t i;
   // Complete inner hash
   memcpy(innerHash,result(),HASH_LENGTH);
@@ -161,8 +162,10 @@ uint8_t* Sha256Class::resultHmac(void) {
   init();
   for (i=0; i<BLOCK_LENGTH; i++) write(keyBuffer[i] ^ HMAC_OPAD);
   for (i=0; i<HASH_LENGTH; i++) write(innerHash[i]);
-  return result();
+  
+  memcpy(out, state.b, HASH_LENGTH);
 }
+
 #if (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__)
 	size_t Sha256Class::write_L(const char *str){
 		if (str == NULL) return 0;
diff --git a/Sha/sha256.h b/Sha/sha256.h
index 58df136..893b0e2 100644
--- a/Sha/sha256.h
+++ b/Sha/sha256.h
@@ -2,14 +2,23 @@
 #define Sha256_h
 
 #include <string.h>
-#if  (defined(__linux) || defined(linux)) || defined(__ARDUINO_X86__)
+
+#if !defined(__linux) || !defined(linux)
+	#include "Arduino.h" //To bring in part.h for Energia
+#endif
+
+#if  (defined(__linux) || defined(linux)) || defined(__ARDUINO_X86__) || defined(__TM4C1294NCPDT__)
 	#define memcpy_P memcpy
 	#undef PROGMEM
-	#define PROGMEM __attribute__(( section(".progmem.data") ))
+	#ifndef __TM4C1294NCPDT__
+		#define PROGMEM __attribute__((section(".progmem.data")))
+	#else
+		#define PROGMEM __attribute__((section(".text")))
+	#endif
 	#define pgm_read_dword(p) (*(p))
-	#if defined(__ARDUINO_X86__)
+	#if defined(__ARDUINO_X86__) || defined(__TM4C1294NCPDT__)
 		#include "Print.h"
-	#endif	
+	#endif
 #else
 	#include <avr/io.h>
 	#include <avr/pgmspace.h>
@@ -21,46 +30,48 @@
 #define HASH_LENGTH 32
 #define BLOCK_LENGTH 64
 
-union _buffer {
-  uint8_t b[BLOCK_LENGTH];
-  uint32_t w[BLOCK_LENGTH/4];
+union _buffer
+{
+	uint8_t b[BLOCK_LENGTH];
+	uint32_t w[BLOCK_LENGTH / 4];
 };
-union _state {
-  uint8_t b[HASH_LENGTH];
-  uint32_t w[HASH_LENGTH/4];
+union _state
+{
+	uint8_t b[HASH_LENGTH];
+	uint32_t w[HASH_LENGTH / 4];
 };
 
-#if  (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__)
+#if  (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__) && !defined(__TM4C1294NCPDT__)
 class Sha256Class
 #else
 class Sha256Class : public Print
 #endif
 {
-  public:
-    void init(void);
-    void initHmac(const uint8_t* secret, int secretLength);
-    uint8_t* result(void);
-    uint8_t* resultHmac(void);
-    #if  (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__)
+public:
+	void init(void);
+	void initHmac(const uint8_t* secret, int secretLength);
+	void result(uint8_t*);
+	void resultHmac(uint8_t*);
+#if  (defined(__linux) || defined(linux)) && !defined(__ARDUINO_X86__) && !defined(__TM4C1294NCPDT__)
 	virtual size_t write(uint8_t);
 	size_t write_L(const char *str);
 	size_t write_L(const uint8_t *buffer, size_t size);
 	size_t print(const char* str);
-    #else
+#else
 	virtual size_t write(uint8_t);
 	using Print::write;
-    #endif
-  private:
-    void pad();
-    void addUncounted(uint8_t data);
-    void hashBlock();
-    uint32_t ror32(uint32_t number, uint8_t bits);
-    _buffer buffer;
-    uint8_t bufferOffset;
-    _state state;
-    uint32_t byteCount;
-    uint8_t keyBuffer[BLOCK_LENGTH];
-    uint8_t innerHash[HASH_LENGTH];
+#endif
+private:
+	void pad();
+	void addUncounted(uint8_t data);
+	void hashBlock();
+	uint32_t ror32(uint32_t number, uint8_t bits);
+	_buffer buffer;
+	uint8_t bufferOffset;
+	_state state;
+	uint32_t byteCount;
+	uint8_t keyBuffer[BLOCK_LENGTH];
+	uint8_t innerHash[HASH_LENGTH];
 };
 extern Sha256Class Sha256;