diff --git a/Makefile b/Makefile
index 871732f..b681f06 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,6 @@ clean:
 	rm -f *.hex *.elf *.map *.list *.o *~ *.lst
 	rm -f usbdrv/*.o usbdrv/*.map usbdrv/*.list usbdrv/*~ usbdrv/*.lst
 
-test: test.c sha1.c
-	gcc test.c sha1.c -o test
+test: test.c sha1.c hmac.c
+	gcc test.c sha1.c hmac.c -o test
 
diff --git a/debug.py b/debug.py
index 41d6570..d05e6a5 100755
--- a/debug.py
+++ b/debug.py
@@ -26,7 +26,10 @@ class SHA1 (object):
             w.append(lrot(w[i - 3] ^ w[i - 8] ^ w[i - 14] ^ w[i - 16], 1)
                 & 0xffffffff)
 
-        #print(w)
+        for i in w:
+            tmp=hex(i)[2:]
+            print("0"*(8-len(tmp)),end="")
+            print(tmp,end=" ")
 
         a = self._h0
         b = self._h1
@@ -82,5 +85,6 @@ print("inner:",SHA1( ipad+text ).hexdigest() )
 print("result:",outer)
 
 
+
 lrot = lambda x, n: (x << n) | (x >> (32 - n))
 
diff --git a/hmac.c b/hmac.c
index 392204c..ec4d0b0 100644
--- a/hmac.c
+++ b/hmac.c
@@ -1,11 +1,9 @@
 
 #include "hmac.h"
 
-#define KEYLEN  20
-static const uint8_t secret[KEYLEN]={0x11}; 
 
-void hmac(uint8_t* msg, uint8_t msglen){
-    uint8_t i;
+void hmac(uint8_t* msg, uint8_t msglen, uint8_t* secret, uint8_t sec_len){
+    int8_t i;
     /* 
     ipad = the byte 0x36 repeated B times 
     opad = the byte 0x5C repeated B times.
@@ -20,47 +18,36 @@ void hmac(uint8_t* msg, uint8_t msglen){
     /* inner Hash */
     sha1_init();
         /*k xor ipad*/
-        for(i=0;i<KEYLEN;i++){
+        for(i=0;i<sec_len;++i){
             sha1_addbyte(secret[i]^IPAD);
         }
         /*if key is shorter than blocksize, treat the rest as 0es*/
-        for(i=KEYLEN;i<SHA1_B;i++){
+        for(i=sec_len;i<SHA1_B;++i){
             sha1_addbyte(IPAD);
         }
         /* text */
-        for(i=0;i<msglen;i++){
+        for(i=0;i<msglen;++i){
             sha1_addbyte(msg[i]);
         }
         sha1_fill(SHA1_B+msglen);
 
     /* save the result */
     memcpy(hmac_result,sha1_digest,SHA1_SIZE);
-    #ifdef TO_LITTLE_ENDIAN32
-	for(i=0; i<SHA1_SIZE/4; i++){
-        ((uint32_t*)hmac_result)[i]=TO_LITTLE_ENDIAN32(((uint32_t*)hmac_result)[i]);
-    }
-    #endif //TO_LITTLE_ENDIAN32
-
     /* outer hash */
     sha1_init();
         /*k xor opad*/
-        for(i=0;i<KEYLEN;i++){
+        for(i=0;i<sec_len;++i){
             sha1_addbyte(secret[i]^OPAD);
         }
         /*if key is shorter than blocksize, treat the rest as 0es*/
-        for(i=KEYLEN;i<SHA1_B;i++){
+        for(i=sec_len;i<SHA1_B;++i){
             sha1_addbyte(OPAD);
         }
-        for(i=0;i<SHA1_SIZE;i++){
+        for(i=SHA1_SIZE-1;i>=0;--i){
             sha1_addbyte(hmac_result[i]);
         }
         sha1_fill(SHA1_B+SHA1_SIZE);
 
     /* save the result */
     memcpy(hmac_result,sha1_digest,SHA1_SIZE);
-    #ifdef TO_LITTLE_ENDIAN32
-	for(i=0; i<SHA1_SIZE/4; i++){
-        ((uint32_t*)hmac_result)[i]=TO_LITTLE_ENDIAN32(((uint32_t*)hmac_result)[i]);
-    }
-    #endif //TO_LITTLE_ENDIAN32
 }
diff --git a/hmac.h b/hmac.h
index d37068f..d30a802 100644
--- a/hmac.h
+++ b/hmac.h
@@ -14,6 +14,6 @@
 
 uint8_t hmac_result[SHA1_SIZE];
 
-void hmac(uint8_t* msg,uint8_t msglen);
+void hmac(uint8_t* msg, uint8_t msglen, uint8_t* secret, uint8_t sec_len);
 
 #endif //_HMAC_H_
diff --git a/sha1.c b/sha1.c
index dd50852..f6b291f 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,4 +1,5 @@
 #include "sha1.h"
+
 #define H1 0x67452301
 #define H2 0xEFCDAB89
 #define H3 0x98BADCFE
@@ -26,24 +27,15 @@ void sha1_addbyte(uint8_t c){
 	if(chunk_cnt==64){
 		/*chunk extension*/
 		uint32_t a,b,c,d,e,chunk_e[64];
-
-        #ifdef TO_LITTLE_ENDIAN32asdas
-		for(i=0; i<16; i++){
-			chunk[i]=TO_LITTLE_ENDIAN32(chunk[i]);
-            //printf("%08x",chunk[i]);
-		}
-        //printf("\n");
-        #endif //TO_LITTLE_ENDIAN32
-
 		for(i=0; i<64; i++){
 			chunk_e[i]= _LROT32( _W(i+16-3) ^ _W(i+16-8) ^ _W(i+16-14) ^ _W(i+16-16), 1 ); 
 		}
 
-		a=sha1_digest[0];
-		b=sha1_digest[1];
+		a=sha1_digest[4];
+		b=sha1_digest[3];
 		c=sha1_digest[2];
-		d=sha1_digest[3];
-		e=sha1_digest[4];
+		d=sha1_digest[1];
+		e=sha1_digest[0];
 	
 		/*main loop*/
 		for(i=0;i<80;i++){
@@ -70,11 +62,11 @@ void sha1_addbyte(uint8_t c){
 			a = temp;
 		}
 
-		sha1_digest[0]+=a;
-		sha1_digest[1]+=b;
+		sha1_digest[4]+=a;
+		sha1_digest[3]+=b;
 		sha1_digest[2]+=c;
-		sha1_digest[3]+=d;
-		sha1_digest[4]+=e;
+		sha1_digest[1]+=d;
+		sha1_digest[0]+=e;
 
 		chunk_cnt=0;
 	}
@@ -107,7 +99,7 @@ void sha1_fill(int32_t len){
 	}
 }
 
-void sha1(char* msg, int32_t len){
+/*void sha1(char* msg, int32_t len){
 	int32_t i;
 	uint8_t j;
 	sha1_init();
@@ -124,14 +116,14 @@ void sha1(char* msg, int32_t len){
 			sha1_addbyte(msg[i+j]);
 		}
 	}
-}
+}*/
 
 void sha1_init(void){
     chunk_cnt=0;
-	sha1_digest[0]=H1;
-	sha1_digest[1]=H2;
+	sha1_digest[4]=H1;
+	sha1_digest[3]=H2;
 	sha1_digest[2]=H3;
-	sha1_digest[3]=H4;
-	sha1_digest[4]=H5;
+	sha1_digest[1]=H4;
+	sha1_digest[0]=H5;
 }
 
diff --git a/test.c b/test.c
index cf825db..a415b79 100644
--- a/test.c
+++ b/test.c
@@ -1,22 +1,57 @@
 
 #include <stdio.h>
 #include <assert.h>
+#include <string.h>
 
 #include "sha1.h"
 
 char sha1sum[41];
 
+#define SHA1STR() {                                               \
+    p=sha1sum;                                                  \
+    for(i=19; i>=0; --i){                                       \
+        sprintf(p,"%02x", ((unsigned char*)(sha1_digest))[i] ); \
+        p+=2;                                                   \
+    }}
+
+#define SOMEDATA "fassadenpassformpassendedachkonstuktionen_lagerraumroboterverwaltungssoftwarejungelnesehtorptsurb_fahrradpumpenschlauch_mcguiver_mit_pommes"
+
+#define SECRET1  {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b}
+#define MSG1 "Hi There"
+
 int main(){
+    /*SHA1STR makro needs those two*/
     int i;
     char* p;
+
     sha1_init();
     sha1_fill(0);
-    p=sha1sum;
-    for(i=0; i<20; ++i){
-        sprintf(p,"%02x", ((char*)(sha1_digest))[i] );
-        p+=2;
+    SHA1STR();
+    printf("SHA1: %s\n",sha1sum);
+    assert(strcmp("da39a3ee5e6b4b0d3255bfef95601890afd80709",sha1sum)==0);
+
+    sha1_init();
+    sha1_addbyte('a');
+    sha1_addbyte('b');
+    sha1_addbyte('c');
+    sha1_fill(3);
+    SHA1STR();
+    printf("SHA1: %s\n",sha1sum);
+    assert(strcmp("a9993e364706816aba3e25717850c26c9cd0d89d",sha1sum)==0);
+
+    sha1_init();
+    for(i=0;i<strlen(SOMEDATA);i++){
+        sha1_addbyte(SOMEDATA[i]);
     }
-    sprintf(sha1sum,"%x%x%x%x%x",sha1_digest[0],sha1_digest[1],sha1_digest[2],sha1_digest[3],sha1_digest[4]);
+    sha1_fill( strlen(SOMEDATA) );
+    SHA1STR();
     printf("SHA1: %s\n",sha1sum);
-//    assert(strncmp("da39a3ee5e6b4b0d3255bfef95601890afd80709",sha1sum)==0);
+    assert(strcmp("4d71043a68fa28b9592d1aa5748e5cd4291c0512",sha1sum)==0);   
+
+    char sec[20]=SECRET1;
+    hmac(MSG1,8,sec,20);
+    SHA1STR();
+    printf("HMAC: %s\n",sha1sum);
+    assert(strcmp("b617318655057264e28bc0b6fb378c8ef146be00",sha1sum)==0);   
+    
 }
diff --git a/trunc.c b/trunc.c
index d56cab9..ad78b73 100644
--- a/trunc.c
+++ b/trunc.c
@@ -22,8 +22,8 @@ int32_t get_otp(uint8_t* hmac, uint8_t digits){
         }
 }
 
-int32_t get_otp_from_cnt(uint64_t cnt, uint8_t digits){
-    cnt=TO_LITTLE_ENDIAN64(cnt);
-    hmac((uint8_t*)(&cnt),8);
+int32_t get_otp_from_cnt(uint32_t cnt, uint8_t digits, uint8_t* secret, uint8_t sec_len){
+    cnt=TO_LITTLE_ENDIAN32(cnt);
+    hmac((uint8_t*)(&cnt),8,secret,sec_len);
     return get_otp(hmac_result,digits);
 }
diff --git a/trunc.h b/trunc.h
index 351d56b..315e6aa 100644
--- a/trunc.h
+++ b/trunc.h
@@ -13,6 +13,6 @@
                                 (x & 0x00000000000000FFul)<<(7*8) 
 
 int32_t get_otp(uint8_t* hmac, uint8_t digits);
-int32_t get_otp_from_cnt(uint64_t cnt, uint8_t digits);
+int32_t get_otp_from_cnt(uint32_t cnt, uint8_t digits, uint8_t* secret, uint8_t sec_len);
 
 #endif