diff --git a/fe_cmov.c b/fe_cmov.c
index 078e413..524c255 100644
--- a/fe_cmov.c
+++ b/fe_cmov.c
@@ -7,7 +7,7 @@ replace (f,g) with (f,g) if b == 0.
 Preconditions: b in {0,1}.
 */
 
-void fe_cmov(fe f,const fe g,unsigned int b)
+void fe_cmov(fe f, const fe g, unsigned int b)
 {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
@@ -39,7 +39,7 @@ void fe_cmov(fe f,const fe g,unsigned int b)
   int32_t x7 = f7 ^ g7;
   int32_t x8 = f8 ^ g8;
   int32_t x9 = f9 ^ g9;
-  b = -b;
+  b = (unsigned int) (- (int) b); /* silence warning */
   x0 &= b;
   x1 &= b;
   x2 &= b;
diff --git a/fe_frombytes.c b/fe_frombytes.c
index feb1ce4..c6e5b68 100644
--- a/fe_frombytes.c
+++ b/fe_frombytes.c
@@ -24,7 +24,7 @@ static uint64_t load_4(const unsigned char *in)
 Ignores top bit of h.
 */
 
-void fe_frombytes(fe h,const unsigned char *s)
+void fe_frombytes(fe h, const unsigned char *s)
 {
   int64_t h0 = load_4(s);
   int64_t h1 = load_3(s + 4) << 6;
@@ -59,14 +59,14 @@ void fe_frombytes(fe h,const unsigned char *s)
   carry6 = (h6 + (int64_t) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
   carry8 = (h8 + (int64_t) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (int32_t) h0;
+  h[1] = (int32_t) h1;
+  h[2] = (int32_t) h2;
+  h[3] = (int32_t) h3;
+  h[4] = (int32_t) h4;
+  h[5] = (int32_t) h5;
+  h[6] = (int32_t) h6;
+  h[7] = (int32_t) h7;
+  h[8] = (int32_t) h8;
+  h[9] = (int32_t) h9;
 }
diff --git a/fe_mul.c b/fe_mul.c
index cfb7dbc..cc1b0aa 100644
--- a/fe_mul.c
+++ b/fe_mul.c
@@ -240,14 +240,14 @@ void fe_mul(fe h,const fe f,const fe g)
   /* |h0| <= 2^25; from now on fits into int32 unchanged */
   /* |h1| <= 1.01*2^24 */
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (int32_t) h0;
+  h[1] = (int32_t) h1;
+  h[2] = (int32_t) h2;
+  h[3] = (int32_t) h3;
+  h[4] = (int32_t) h4;
+  h[5] = (int32_t) h5;
+  h[6] = (int32_t) h6;
+  h[7] = (int32_t) h7;
+  h[8] = (int32_t) h8;
+  h[9] = (int32_t) h9;
 }
diff --git a/fe_sq.c b/fe_sq.c
index ea0504c..28c922c 100644
--- a/fe_sq.c
+++ b/fe_sq.c
@@ -136,14 +136,14 @@ void fe_sq(fe h,const fe f)
 
   carry0 = (h0 + (int64_t) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (int32_t) h0;
+  h[1] = (int32_t) h1;
+  h[2] = (int32_t) h2;
+  h[3] = (int32_t) h3;
+  h[4] = (int32_t) h4;
+  h[5] = (int32_t) h5;
+  h[6] = (int32_t) h6;
+  h[7] = (int32_t) h7;
+  h[8] = (int32_t) h8;
+  h[9] = (int32_t) h9;
 }
diff --git a/fe_sq2.c b/fe_sq2.c
index 44d2386..be5275d 100644
--- a/fe_sq2.c
+++ b/fe_sq2.c
@@ -147,14 +147,14 @@ void fe_sq2(fe h,const fe f)
 
   carry0 = (h0 + (int64_t) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (int32_t) h0;
+  h[1] = (int32_t) h1;
+  h[2] = (int32_t) h2;
+  h[3] = (int32_t) h3;
+  h[4] = (int32_t) h4;
+  h[5] = (int32_t) h5;
+  h[6] = (int32_t) h6;
+  h[7] = (int32_t) h7;
+  h[8] = (int32_t) h8;
+  h[9] = (int32_t) h9;
 }
diff --git a/fe_tobytes.c b/fe_tobytes.c
index 40a2ee3..a63f2c0 100644
--- a/fe_tobytes.c
+++ b/fe_tobytes.c
@@ -84,36 +84,36 @@ void fe_tobytes(unsigned char *s,const fe h)
   Goal: Output h0+...+2^230 h9.
   */
 
-  s[0] = h0 >> 0;
-  s[1] = h0 >> 8;
-  s[2] = h0 >> 16;
-  s[3] = (h0 >> 24) | (h1 << 2);
-  s[4] = h1 >> 6;
-  s[5] = h1 >> 14;
-  s[6] = (h1 >> 22) | (h2 << 3);
-  s[7] = h2 >> 5;
-  s[8] = h2 >> 13;
-  s[9] = (h2 >> 21) | (h3 << 5);
-  s[10] = h3 >> 3;
-  s[11] = h3 >> 11;
-  s[12] = (h3 >> 19) | (h4 << 6);
-  s[13] = h4 >> 2;
-  s[14] = h4 >> 10;
-  s[15] = h4 >> 18;
-  s[16] = h5 >> 0;
-  s[17] = h5 >> 8;
-  s[18] = h5 >> 16;
-  s[19] = (h5 >> 24) | (h6 << 1);
-  s[20] = h6 >> 7;
-  s[21] = h6 >> 15;
-  s[22] = (h6 >> 23) | (h7 << 3);
-  s[23] = h7 >> 5;
-  s[24] = h7 >> 13;
-  s[25] = (h7 >> 21) | (h8 << 4);
-  s[26] = h8 >> 4;
-  s[27] = h8 >> 12;
-  s[28] = (h8 >> 20) | (h9 << 6);
-  s[29] = h9 >> 2;
-  s[30] = h9 >> 10;
-  s[31] = h9 >> 18;
+  s[0] = (unsigned char) (h0 >> 0);
+  s[1] = (unsigned char) (h0 >> 8);
+  s[2] = (unsigned char) (h0 >> 16);
+  s[3] = (unsigned char) ((h0 >> 24) | (h1 << 2));
+  s[4] = (unsigned char) (h1 >> 6);
+  s[5] = (unsigned char) (h1 >> 14);
+  s[6] = (unsigned char) ((h1 >> 22) | (h2 << 3));
+  s[7] = (unsigned char) (h2 >> 5);
+  s[8] = (unsigned char) (h2 >> 13);
+  s[9] = (unsigned char) ((h2 >> 21) | (h3 << 5));
+  s[10] = (unsigned char) (h3 >> 3);
+  s[11] = (unsigned char) (h3 >> 11);
+  s[12] = (unsigned char) ((h3 >> 19) | (h4 << 6));
+  s[13] = (unsigned char) (h4 >> 2);
+  s[14] = (unsigned char) (h4 >> 10);
+  s[15] = (unsigned char) (h4 >> 18);
+  s[16] = (unsigned char) (h5 >> 0);
+  s[17] = (unsigned char) (h5 >> 8);
+  s[18] = (unsigned char) (h5 >> 16);
+  s[19] = (unsigned char) ((h5 >> 24) | (h6 << 1));
+  s[20] = (unsigned char) (h6 >> 7);
+  s[21] = (unsigned char) (h6 >> 15);
+  s[22] = (unsigned char) ((h6 >> 23) | (h7 << 3));
+  s[23] = (unsigned char) (h7 >> 5);
+  s[24] = (unsigned char) (h7 >> 13);
+  s[25] = (unsigned char) ((h7 >> 21) | (h8 << 4));
+  s[26] = (unsigned char) (h8 >> 4);
+  s[27] = (unsigned char) (h8 >> 12);
+  s[28] = (unsigned char) ((h8 >> 20) | (h9 << 6));
+  s[29] = (unsigned char) (h9 >> 2);
+  s[30] = (unsigned char) (h9 >> 10);
+  s[31] = (unsigned char) (h9 >> 18);
 }
diff --git a/ge_scalarmult_base.c b/ge_scalarmult_base.c
index 828f825..4a9324e 100644
--- a/ge_scalarmult_base.c
+++ b/ge_scalarmult_base.c
@@ -9,14 +9,14 @@ static unsigned char equal(signed char b,signed char c)
   uint32_t y = x; /* 0: yes; 1..255: no */
   y -= 1; /* 4294967295: yes; 0..254: no */
   y >>= 31; /* 1: yes; 0: no */
-  return y;
+  return (unsigned char) y;
 }
 
 static unsigned char negative(signed char b)
 {
   unsigned long long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
   x >>= 63; /* 1: yes; 0: no */
-  return x;
+  return (unsigned char) x;
 }
 
 static void cmov(ge_precomp *t,ge_precomp *u,unsigned char b)
diff --git a/keypair.c b/keypair.c
index ca65c5e..cf5ceae 100644
--- a/keypair.c
+++ b/keypair.c
@@ -2,22 +2,22 @@
 #include "sha512.h"
 #include "ge.h"
 
-int ed25519_sign_keypair(unsigned char *pk, unsigned char *sk, unsigned char *seed)
+int ed25519_create_keypair(unsigned char *verify_key, unsigned char *sign_key, unsigned char *seed)
 {
   unsigned char h[64];
   ge_p3 A;
   int i;
 
-  sha512(h,seed,32);
+  sha512(seed, 32, h);
   h[0] &= 248;
   h[31] &= 63;
   h[31] |= 64;
 
-  ge_scalarmult_base(&A,h);
-  ge_p3_tobytes(pk,&A);
+  ge_scalarmult_base(&A, h);
+  ge_p3_tobytes(verify_key, &A);
 
-  for (i = 0;i < 32;++i) sk[i] = seed[i];
-  for (i = 0;i < 32;++i) sk[32 + i] = pk[i];
+  for (i = 0; i < 32; ++i) sign_key[i] = seed[i];
+  for (i = 0; i < 32; ++i) sign_key[32 + i] = verify_key[i];
     
   return 0;
 }
diff --git a/open.c b/open.c
index 862c7b6..456be43 100644
--- a/open.c
+++ b/open.c
@@ -2,38 +2,32 @@
 #include "sha512.h"
 #include "ge.h"
 #include "sc.h"
+#include "verify.h"
 
-int ed25519_sign_open(
-  unsigned char *m,unsigned long long *mlen,
-  const unsigned char *sm,unsigned long long smlen,
-  const unsigned char *pk
-)
+int ed25519_verify(const unsigned char *signature, const unsigned char *message, unsigned int message_len, const unsigned char *verify_key)
 {
   unsigned char h[64];
-  unsigned char checkr[32];
+  unsigned char checker[32];
+  sha512_ctx hash;
   ge_p3 A;
   ge_p2 R;
-  unsigned long long i;
 
-  *mlen = -1;
-  if (smlen < 64) return -1;
-  if (sm[63] & 224) return -1;
-  if (ge_frombytes_negate_vartime(&A,pk) != 0) return -1;
+  if (signature[63] & 224) return -1;
+  if (ge_frombytes_negate_vartime(&A,verify_key) != 0) return -1;
+
+  sha512_init(&hash);
+  sha512_update(&hash, signature, 32);
+  sha512_update(&hash, verify_key, 32);
+  sha512_update(&hash, message, message_len);
+  sha512_final(&hash, h);
 
-  for (i = 0;i < smlen;++i) m[i] = sm[i];
-  for (i = 0;i < 32;++i) m[32 + i] = pk[i];
-  sha512(h,m,smlen);
   sc_reduce(h);
 
-  ge_double_scalarmult_vartime(&R,h,&A,sm + 32);
-  ge_tobytes(checkr,&R);
-  if (crypto_verify_32(checkr,sm) != 0) {
-    for (i = 0;i < smlen;++i) m[i] = 0;
+  ge_double_scalarmult_vartime(&R,h,&A,signature + 32);
+  ge_tobytes(checker, &R);
+  if (crypto_verify_32(checker, signature) != 0) {
     return -1;
   }
 
-  for (i = 0;i < smlen - 64;++i) m[i] = sm[64 + i];
-  for (i = smlen - 64;i < smlen;++i) m[i] = 0;
-  *mlen = smlen - 64;
   return 0;
 }
diff --git a/sc_muladd.c b/sc_muladd.c
index 35df5c4..67dc4d4 100644
--- a/sc_muladd.c
+++ b/sc_muladd.c
@@ -331,36 +331,36 @@ void sc_muladd(unsigned char *s,const unsigned char *a,const unsigned char *b,co
   carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21;
   carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21;
 
-  s[0] = s0 >> 0;
-  s[1] = s0 >> 8;
-  s[2] = (s0 >> 16) | (s1 << 5);
-  s[3] = s1 >> 3;
-  s[4] = s1 >> 11;
-  s[5] = (s1 >> 19) | (s2 << 2);
-  s[6] = s2 >> 6;
-  s[7] = (s2 >> 14) | (s3 << 7);
-  s[8] = s3 >> 1;
-  s[9] = s3 >> 9;
-  s[10] = (s3 >> 17) | (s4 << 4);
-  s[11] = s4 >> 4;
-  s[12] = s4 >> 12;
-  s[13] = (s4 >> 20) | (s5 << 1);
-  s[14] = s5 >> 7;
-  s[15] = (s5 >> 15) | (s6 << 6);
-  s[16] = s6 >> 2;
-  s[17] = s6 >> 10;
-  s[18] = (s6 >> 18) | (s7 << 3);
-  s[19] = s7 >> 5;
-  s[20] = s7 >> 13;
-  s[21] = s8 >> 0;
-  s[22] = s8 >> 8;
-  s[23] = (s8 >> 16) | (s9 << 5);
-  s[24] = s9 >> 3;
-  s[25] = s9 >> 11;
-  s[26] = (s9 >> 19) | (s10 << 2);
-  s[27] = s10 >> 6;
-  s[28] = (s10 >> 14) | (s11 << 7);
-  s[29] = s11 >> 1;
-  s[30] = s11 >> 9;
-  s[31] = s11 >> 17;
+  s[0] = (unsigned char) (s0 >> 0);
+  s[1] = (unsigned char) (s0 >> 8);
+  s[2] = (unsigned char) ((s0 >> 16) | (s1 << 5));
+  s[3] = (unsigned char) (s1 >> 3);
+  s[4] = (unsigned char) (s1 >> 11);
+  s[5] = (unsigned char) ((s1 >> 19) | (s2 << 2));
+  s[6] = (unsigned char) (s2 >> 6);
+  s[7] = (unsigned char) ((s2 >> 14) | (s3 << 7));
+  s[8] = (unsigned char) (s3 >> 1);
+  s[9] = (unsigned char) (s3 >> 9);
+  s[10] = (unsigned char) ((s3 >> 17) | (s4 << 4));
+  s[11] = (unsigned char) (s4 >> 4);
+  s[12] = (unsigned char) (s4 >> 12);
+  s[13] = (unsigned char) ((s4 >> 20) | (s5 << 1));
+  s[14] = (unsigned char) (s5 >> 7);
+  s[15] = (unsigned char) ((s5 >> 15) | (s6 << 6));
+  s[16] = (unsigned char) (s6 >> 2);
+  s[17] = (unsigned char) (s6 >> 10);
+  s[18] = (unsigned char) ((s6 >> 18) | (s7 << 3));
+  s[19] = (unsigned char) (s7 >> 5);
+  s[20] = (unsigned char) (s7 >> 13);
+  s[21] = (unsigned char) (s8 >> 0);
+  s[22] = (unsigned char) (s8 >> 8);
+  s[23] = (unsigned char) ((s8 >> 16) | (s9 << 5));
+  s[24] = (unsigned char) (s9 >> 3);
+  s[25] = (unsigned char) (s9 >> 11);
+  s[26] = (unsigned char) ((s9 >> 19) | (s10 << 2));
+  s[27] = (unsigned char) (s10 >> 6);
+  s[28] = (unsigned char) ((s10 >> 14) | (s11 << 7));
+  s[29] = (unsigned char) (s11 >> 1);
+  s[30] = (unsigned char) (s11 >> 9);
+  s[31] = (unsigned char) (s11 >> 17);
 }
diff --git a/sc_reduce.c b/sc_reduce.c
index 62ed9af..312e537 100644
--- a/sc_reduce.c
+++ b/sc_reduce.c
@@ -238,36 +238,36 @@ void sc_reduce(unsigned char *s)
   carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21;
   carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21;
 
-  s[0] = s0 >> 0;
-  s[1] = s0 >> 8;
-  s[2] = (s0 >> 16) | (s1 << 5);
-  s[3] = s1 >> 3;
-  s[4] = s1 >> 11;
-  s[5] = (s1 >> 19) | (s2 << 2);
-  s[6] = s2 >> 6;
-  s[7] = (s2 >> 14) | (s3 << 7);
-  s[8] = s3 >> 1;
-  s[9] = s3 >> 9;
-  s[10] = (s3 >> 17) | (s4 << 4);
-  s[11] = s4 >> 4;
-  s[12] = s4 >> 12;
-  s[13] = (s4 >> 20) | (s5 << 1);
-  s[14] = s5 >> 7;
-  s[15] = (s5 >> 15) | (s6 << 6);
-  s[16] = s6 >> 2;
-  s[17] = s6 >> 10;
-  s[18] = (s6 >> 18) | (s7 << 3);
-  s[19] = s7 >> 5;
-  s[20] = s7 >> 13;
-  s[21] = s8 >> 0;
-  s[22] = s8 >> 8;
-  s[23] = (s8 >> 16) | (s9 << 5);
-  s[24] = s9 >> 3;
-  s[25] = s9 >> 11;
-  s[26] = (s9 >> 19) | (s10 << 2);
-  s[27] = s10 >> 6;
-  s[28] = (s10 >> 14) | (s11 << 7);
-  s[29] = s11 >> 1;
-  s[30] = s11 >> 9;
-  s[31] = s11 >> 17;
+  s[0] = (unsigned char) (s0 >> 0);
+  s[1] = (unsigned char) (s0 >> 8);
+  s[2] = (unsigned char) ((s0 >> 16) | (s1 << 5));
+  s[3] = (unsigned char) (s1 >> 3);
+  s[4] = (unsigned char) (s1 >> 11);
+  s[5] = (unsigned char) ((s1 >> 19) | (s2 << 2));
+  s[6] = (unsigned char) (s2 >> 6);
+  s[7] = (unsigned char) ((s2 >> 14) | (s3 << 7));
+  s[8] = (unsigned char) (s3 >> 1);
+  s[9] = (unsigned char) (s3 >> 9);
+  s[10] = (unsigned char) ((s3 >> 17) | (s4 << 4));
+  s[11] = (unsigned char) (s4 >> 4);
+  s[12] = (unsigned char) (s4 >> 12);
+  s[13] = (unsigned char) ((s4 >> 20) | (s5 << 1));
+  s[14] = (unsigned char) (s5 >> 7);
+  s[15] = (unsigned char) ((s5 >> 15) | (s6 << 6));
+  s[16] = (unsigned char) (s6 >> 2);
+  s[17] = (unsigned char) (s6 >> 10);
+  s[18] = (unsigned char) ((s6 >> 18) | (s7 << 3));
+  s[19] = (unsigned char) (s7 >> 5);
+  s[20] = (unsigned char) (s7 >> 13);
+  s[21] = (unsigned char) (s8 >> 0);
+  s[22] = (unsigned char) (s8 >> 8);
+  s[23] = (unsigned char) ((s8 >> 16) | (s9 << 5));
+  s[24] = (unsigned char) (s9 >> 3);
+  s[25] = (unsigned char) (s9 >> 11);
+  s[26] = (unsigned char) ((s9 >> 19) | (s10 << 2));
+  s[27] = (unsigned char) (s10 >> 6);
+  s[28] = (unsigned char) ((s10 >> 14) | (s11 << 7));
+  s[29] = (unsigned char) (s11 >> 1);
+  s[30] = (unsigned char) (s11 >> 9);
+  s[31] = (unsigned char) (s11 >> 17);
 }
diff --git a/sha512.c b/sha512.c
index ee4ce1d..3d88442 100644
--- a/sha512.c
+++ b/sha512.c
@@ -1,302 +1,359 @@
 /*
-20080913
-D. J. Bernstein
-Public domain.
-*/
+ * FIPS 180-2 SHA-224/256/384/512 implementation
+ * Last update: 02/02/2007
+ * Issue date:  04/30/2005
+ *
+ * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
+#if 0
+#define UNROLL_LOOPS /* Enable loops unrolling */
+#endif
+
+#include "sha512.h"
 #include "pstdint.h"
 
-static int64_t load_bigendian(const unsigned char *x)
-{
-  return
-      (int64_t) (x[7]) \
-  | (((int64_t) (x[6])) << 8) \
-  | (((int64_t) (x[5])) << 16) \
-  | (((int64_t) (x[4])) << 24) \
-  | (((int64_t) (x[3])) << 32) \
-  | (((int64_t) (x[2])) << 40) \
-  | (((int64_t) (x[1])) << 48) \
-  | (((int64_t) (x[0])) << 56)
-  ;
+#define SHFR(x, n)    (x >> n)
+#define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
+#define ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
+#define CH(x, y, z)  ((x & y) ^ (~x & z))
+#define MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
+
+#define SHA512_F1(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
+#define SHA512_F2(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
+#define SHA512_F3(x) (ROTR(x,  1) ^ ROTR(x,  8) ^ SHFR(x,  7))
+#define SHA512_F4(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHFR(x,  6))
+
+#define UNPACK32(x, str)                      \
+{                                             \
+    *((str) + 3) = (uint8_t) ((x)      );       \
+    *((str) + 2) = (uint8_t) ((x) >>  8);       \
+    *((str) + 1) = (uint8_t) ((x) >> 16);       \
+    *((str) + 0) = (uint8_t) ((x) >> 24);       \
 }
 
-static void store_bigendian(unsigned char *x,int64_t u)
-{
-  x[7] = u; u >>= 8;
-  x[6] = u; u >>= 8;
-  x[5] = u; u >>= 8;
-  x[4] = u; u >>= 8;
-  x[3] = u; u >>= 8;
-  x[2] = u; u >>= 8;
-  x[1] = u; u >>= 8;
-  x[0] = u;
+#define PACK32(str, x)                        \
+{                                             \
+    *(x) =   ((uint32_t) *((str) + 3)      )    \
+           | ((uint32_t) *((str) + 2) <<  8)    \
+           | ((uint32_t) *((str) + 1) << 16)    \
+           | ((uint32_t) *((str) + 0) << 24);   \
 }
 
-#define SHR(x,c) ((x) >> (c))
-#define ROTR(x,c) (((x) >> (c)) | ((x) << (64 - (c))))
-
-#define Ch(x,y,z) ((x & y) ^ (~x & z))
-#define Maj(x,y,z) ((x & y) ^ (x & z) ^ (y & z))
-#define Sigma0(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
-#define Sigma1(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
-#define sigma0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x,7))
-#define sigma1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x,6))
-
-#define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0;
-
-#define EXPAND \
-  M(w0 ,w14,w9 ,w1 ) \
-  M(w1 ,w15,w10,w2 ) \
-  M(w2 ,w0 ,w11,w3 ) \
-  M(w3 ,w1 ,w12,w4 ) \
-  M(w4 ,w2 ,w13,w5 ) \
-  M(w5 ,w3 ,w14,w6 ) \
-  M(w6 ,w4 ,w15,w7 ) \
-  M(w7 ,w5 ,w0 ,w8 ) \
-  M(w8 ,w6 ,w1 ,w9 ) \
-  M(w9 ,w7 ,w2 ,w10) \
-  M(w10,w8 ,w3 ,w11) \
-  M(w11,w9 ,w4 ,w12) \
-  M(w12,w10,w5 ,w13) \
-  M(w13,w11,w6 ,w14) \
-  M(w14,w12,w7 ,w15) \
-  M(w15,w13,w8 ,w0 )
-
-#define F(w,k) \
-  T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \
-  T2 = Sigma0(a) + Maj(a,b,c); \
-  h = g; \
-  g = f; \
-  f = e; \
-  e = d + T1; \
-  d = c; \
-  c = b; \
-  b = a; \
-  a = T1 + T2;
-
-int sha512_blocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen)
-{
-  int64_t state[8];
-  int64_t a;
-  int64_t b;
-  int64_t c;
-  int64_t d;
-  int64_t e;
-  int64_t f;
-  int64_t g;
-  int64_t h;
-  int64_t T1;
-  int64_t T2;
-
-  a = load_bigendian(statebytes +  0); state[0] = a;
-  b = load_bigendian(statebytes +  8); state[1] = b;
-  c = load_bigendian(statebytes + 16); state[2] = c;
-  d = load_bigendian(statebytes + 24); state[3] = d;
-  e = load_bigendian(statebytes + 32); state[4] = e;
-  f = load_bigendian(statebytes + 40); state[5] = f;
-  g = load_bigendian(statebytes + 48); state[6] = g;
-  h = load_bigendian(statebytes + 56); state[7] = h;
-
-  while (inlen >= 128) {
-    int64_t w0  = load_bigendian(in +   0);
-    int64_t w1  = load_bigendian(in +   8);
-    int64_t w2  = load_bigendian(in +  16);
-    int64_t w3  = load_bigendian(in +  24);
-    int64_t w4  = load_bigendian(in +  32);
-    int64_t w5  = load_bigendian(in +  40);
-    int64_t w6  = load_bigendian(in +  48);
-    int64_t w7  = load_bigendian(in +  56);
-    int64_t w8  = load_bigendian(in +  64);
-    int64_t w9  = load_bigendian(in +  72);
-    int64_t w10 = load_bigendian(in +  80);
-    int64_t w11 = load_bigendian(in +  88);
-    int64_t w12 = load_bigendian(in +  96);
-    int64_t w13 = load_bigendian(in + 104);
-    int64_t w14 = load_bigendian(in + 112);
-    int64_t w15 = load_bigendian(in + 120);
-
-    F(w0 ,0x428a2f98d728ae22ULL)
-    F(w1 ,0x7137449123ef65cdULL)
-    F(w2 ,0xb5c0fbcfec4d3b2fULL)
-    F(w3 ,0xe9b5dba58189dbbcULL)
-    F(w4 ,0x3956c25bf348b538ULL)
-    F(w5 ,0x59f111f1b605d019ULL)
-    F(w6 ,0x923f82a4af194f9bULL)
-    F(w7 ,0xab1c5ed5da6d8118ULL)
-    F(w8 ,0xd807aa98a3030242ULL)
-    F(w9 ,0x12835b0145706fbeULL)
-    F(w10,0x243185be4ee4b28cULL)
-    F(w11,0x550c7dc3d5ffb4e2ULL)
-    F(w12,0x72be5d74f27b896fULL)
-    F(w13,0x80deb1fe3b1696b1ULL)
-    F(w14,0x9bdc06a725c71235ULL)
-    F(w15,0xc19bf174cf692694ULL)
-
-    EXPAND
-
-    F(w0 ,0xe49b69c19ef14ad2ULL)
-    F(w1 ,0xefbe4786384f25e3ULL)
-    F(w2 ,0x0fc19dc68b8cd5b5ULL)
-    F(w3 ,0x240ca1cc77ac9c65ULL)
-    F(w4 ,0x2de92c6f592b0275ULL)
-    F(w5 ,0x4a7484aa6ea6e483ULL)
-    F(w6 ,0x5cb0a9dcbd41fbd4ULL)
-    F(w7 ,0x76f988da831153b5ULL)
-    F(w8 ,0x983e5152ee66dfabULL)
-    F(w9 ,0xa831c66d2db43210ULL)
-    F(w10,0xb00327c898fb213fULL)
-    F(w11,0xbf597fc7beef0ee4ULL)
-    F(w12,0xc6e00bf33da88fc2ULL)
-    F(w13,0xd5a79147930aa725ULL)
-    F(w14,0x06ca6351e003826fULL)
-    F(w15,0x142929670a0e6e70ULL)
-
-    EXPAND
-
-    F(w0 ,0x27b70a8546d22ffcULL)
-    F(w1 ,0x2e1b21385c26c926ULL)
-    F(w2 ,0x4d2c6dfc5ac42aedULL)
-    F(w3 ,0x53380d139d95b3dfULL)
-    F(w4 ,0x650a73548baf63deULL)
-    F(w5 ,0x766a0abb3c77b2a8ULL)
-    F(w6 ,0x81c2c92e47edaee6ULL)
-    F(w7 ,0x92722c851482353bULL)
-    F(w8 ,0xa2bfe8a14cf10364ULL)
-    F(w9 ,0xa81a664bbc423001ULL)
-    F(w10,0xc24b8b70d0f89791ULL)
-    F(w11,0xc76c51a30654be30ULL)
-    F(w12,0xd192e819d6ef5218ULL)
-    F(w13,0xd69906245565a910ULL)
-    F(w14,0xf40e35855771202aULL)
-    F(w15,0x106aa07032bbd1b8ULL)
-
-    EXPAND
-
-    F(w0 ,0x19a4c116b8d2d0c8ULL)
-    F(w1 ,0x1e376c085141ab53ULL)
-    F(w2 ,0x2748774cdf8eeb99ULL)
-    F(w3 ,0x34b0bcb5e19b48a8ULL)
-    F(w4 ,0x391c0cb3c5c95a63ULL)
-    F(w5 ,0x4ed8aa4ae3418acbULL)
-    F(w6 ,0x5b9cca4f7763e373ULL)
-    F(w7 ,0x682e6ff3d6b2b8a3ULL)
-    F(w8 ,0x748f82ee5defb2fcULL)
-    F(w9 ,0x78a5636f43172f60ULL)
-    F(w10,0x84c87814a1f0ab72ULL)
-    F(w11,0x8cc702081a6439ecULL)
-    F(w12,0x90befffa23631e28ULL)
-    F(w13,0xa4506cebde82bde9ULL)
-    F(w14,0xbef9a3f7b2c67915ULL)
-    F(w15,0xc67178f2e372532bULL)
-
-    EXPAND
-
-    F(w0 ,0xca273eceea26619cULL)
-    F(w1 ,0xd186b8c721c0c207ULL)
-    F(w2 ,0xeada7dd6cde0eb1eULL)
-    F(w3 ,0xf57d4f7fee6ed178ULL)
-    F(w4 ,0x06f067aa72176fbaULL)
-    F(w5 ,0x0a637dc5a2c898a6ULL)
-    F(w6 ,0x113f9804bef90daeULL)
-    F(w7 ,0x1b710b35131c471bULL)
-    F(w8 ,0x28db77f523047d84ULL)
-    F(w9 ,0x32caab7b40c72493ULL)
-    F(w10,0x3c9ebe0a15c9bebcULL)
-    F(w11,0x431d67c49c100d4cULL)
-    F(w12,0x4cc5d4becb3e42b6ULL)
-    F(w13,0x597f299cfc657e2aULL)
-    F(w14,0x5fcb6fab3ad6faecULL)
-    F(w15,0x6c44198c4a475817ULL)
-
-    a += state[0];
-    b += state[1];
-    c += state[2];
-    d += state[3];
-    e += state[4];
-    f += state[5];
-    g += state[6];
-    h += state[7];
-  
-    state[0] = a;
-    state[1] = b;
-    state[2] = c;
-    state[3] = d;
-    state[4] = e;
-    state[5] = f;
-    state[6] = g;
-    state[7] = h;
-
-    in += 128;
-    inlen -= 128;
-  }
-
-  store_bigendian(statebytes +  0,state[0]);
-  store_bigendian(statebytes +  8,state[1]);
-  store_bigendian(statebytes + 16,state[2]);
-  store_bigendian(statebytes + 24,state[3]);
-  store_bigendian(statebytes + 32,state[4]);
-  store_bigendian(statebytes + 40,state[5]);
-  store_bigendian(statebytes + 48,state[6]);
-  store_bigendian(statebytes + 56,state[7]);
-
-  return inlen;
+#define UNPACK64(x, str)                      \
+{                                             \
+    *((str) + 7) = (uint8_t) ((x)      );       \
+    *((str) + 6) = (uint8_t) ((x) >>  8);       \
+    *((str) + 5) = (uint8_t) ((x) >> 16);       \
+    *((str) + 4) = (uint8_t) ((x) >> 24);       \
+    *((str) + 3) = (uint8_t) ((x) >> 32);       \
+    *((str) + 2) = (uint8_t) ((x) >> 40);       \
+    *((str) + 1) = (uint8_t) ((x) >> 48);       \
+    *((str) + 0) = (uint8_t) ((x) >> 56);       \
 }
 
-static const unsigned char iv[64] = {
-  0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
-  0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
-  0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
-  0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
-  0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
-  0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
-  0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
-  0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
-} ;
-
-int sha512(unsigned char *out,const unsigned char *in,unsigned long long inlen)
-{
-  unsigned char h[64];
-  unsigned char padded[256];
-  int i;
-  unsigned long long bytes = inlen;
-
-  for (i = 0;i < 64;++i) h[i] = iv[i];
-
-  sha512_blocks(h,in,inlen);
-  in += inlen;
-  inlen &= 127;
-  in -= inlen;
-
-  for (i = 0;i < inlen;++i) padded[i] = in[i];
-  padded[inlen] = 0x80;
-
-  if (inlen < 112) {
-    for (i = inlen + 1;i < 119;++i) padded[i] = 0;
-    padded[119] = bytes >> 61;
-    padded[120] = bytes >> 53;
-    padded[121] = bytes >> 45;
-    padded[122] = bytes >> 37;
-    padded[123] = bytes >> 29;
-    padded[124] = bytes >> 21;
-    padded[125] = bytes >> 13;
-    padded[126] = bytes >> 5;
-    padded[127] = bytes << 3;
-    sha512_blocks(h,padded,128);
-  } else {
-    for (i = inlen + 1;i < 247;++i) padded[i] = 0;
-    padded[247] = bytes >> 61;
-    padded[248] = bytes >> 53;
-    padded[249] = bytes >> 45;
-    padded[250] = bytes >> 37;
-    padded[251] = bytes >> 29;
-    padded[252] = bytes >> 21;
-    padded[253] = bytes >> 13;
-    padded[254] = bytes >> 5;
-    padded[255] = bytes << 3;
-    sha512_blocks(h,padded,256);
-  }
-
-  for (i = 0;i < 64;++i) out[i] = h[i];
-
-  return 0;
+#define PACK64(str, x)                        \
+{                                             \
+    *(x) =   ((uint64_t) *((str) + 7)      )    \
+           | ((uint64_t) *((str) + 6) <<  8)    \
+           | ((uint64_t) *((str) + 5) << 16)    \
+           | ((uint64_t) *((str) + 4) << 24)    \
+           | ((uint64_t) *((str) + 3) << 32)    \
+           | ((uint64_t) *((str) + 2) << 40)    \
+           | ((uint64_t) *((str) + 1) << 48)    \
+           | ((uint64_t) *((str) + 0) << 56);   \
+}
+
+/* Macros used for loops unrolling */
+
+#define SHA512_SCR(i)                         \
+{                                             \
+    w[i] =  SHA512_F4(w[i -  2]) + w[i -  7]  \
+          + SHA512_F3(w[i - 15]) + w[i - 16]; \
+}
+
+
+#define SHA512_EXP(a, b, c, d, e, f, g ,h, j)               \
+{                                                           \
+    t1 = wv[h] + SHA512_F2(wv[e]) + CH(wv[e], wv[f], wv[g]) \
+         + sha512_k[j] + w[j];                              \
+    t2 = SHA512_F1(wv[a]) + MAJ(wv[a], wv[b], wv[c]);       \
+    wv[d] += t1;                                            \
+    wv[h] = t1 + t2;                                        \
+}
+
+uint64_t sha512_h0[8] =
+            {0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
+             0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
+             0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
+             0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL};
+
+uint64_t sha512_k[80] =
+            {0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+             0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+             0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+             0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+             0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+             0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+             0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+             0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+             0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+             0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+             0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+             0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+             0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+             0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+             0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+             0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+             0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+             0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+             0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+             0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+             0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+             0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+             0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+             0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+             0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+             0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+             0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+             0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+             0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+             0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+             0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+             0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+             0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+             0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+             0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+             0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+             0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+             0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+             0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+             0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL};
+
+
+
+/* SHA-512 functions */
+
+void sha512_transf(sha512_ctx *ctx, const unsigned char *message,
+                   unsigned int block_nb)
+{
+    uint64_t w[80];
+    uint64_t wv[8];
+    uint64_t t1, t2;
+    const unsigned char *sub_block;
+    int i, j;
+
+    for (i = 0; i < (int) block_nb; i++) {
+        sub_block = message + (i << 7);
+
+#ifndef UNROLL_LOOPS
+        for (j = 0; j < 16; j++) {
+            PACK64(&sub_block[j << 3], &w[j]);
+        }
+
+        for (j = 16; j < 80; j++) {
+            SHA512_SCR(j);
+        }
+
+        for (j = 0; j < 8; j++) {
+            wv[j] = ctx->h[j];
+        }
+
+        for (j = 0; j < 80; j++) {
+            t1 = wv[7] + SHA512_F2(wv[4]) + CH(wv[4], wv[5], wv[6])
+                + sha512_k[j] + w[j];
+            t2 = SHA512_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
+            wv[7] = wv[6];
+            wv[6] = wv[5];
+            wv[5] = wv[4];
+            wv[4] = wv[3] + t1;
+            wv[3] = wv[2];
+            wv[2] = wv[1];
+            wv[1] = wv[0];
+            wv[0] = t1 + t2;
+        }
+
+        for (j = 0; j < 8; j++) {
+            ctx->h[j] += wv[j];
+        }
+#else
+        PACK64(&sub_block[  0], &w[ 0]); PACK64(&sub_block[  8], &w[ 1]);
+        PACK64(&sub_block[ 16], &w[ 2]); PACK64(&sub_block[ 24], &w[ 3]);
+        PACK64(&sub_block[ 32], &w[ 4]); PACK64(&sub_block[ 40], &w[ 5]);
+        PACK64(&sub_block[ 48], &w[ 6]); PACK64(&sub_block[ 56], &w[ 7]);
+        PACK64(&sub_block[ 64], &w[ 8]); PACK64(&sub_block[ 72], &w[ 9]);
+        PACK64(&sub_block[ 80], &w[10]); PACK64(&sub_block[ 88], &w[11]);
+        PACK64(&sub_block[ 96], &w[12]); PACK64(&sub_block[104], &w[13]);
+        PACK64(&sub_block[112], &w[14]); PACK64(&sub_block[120], &w[15]);
+
+        SHA512_SCR(16); SHA512_SCR(17); SHA512_SCR(18); SHA512_SCR(19);
+        SHA512_SCR(20); SHA512_SCR(21); SHA512_SCR(22); SHA512_SCR(23);
+        SHA512_SCR(24); SHA512_SCR(25); SHA512_SCR(26); SHA512_SCR(27);
+        SHA512_SCR(28); SHA512_SCR(29); SHA512_SCR(30); SHA512_SCR(31);
+        SHA512_SCR(32); SHA512_SCR(33); SHA512_SCR(34); SHA512_SCR(35);
+        SHA512_SCR(36); SHA512_SCR(37); SHA512_SCR(38); SHA512_SCR(39);
+        SHA512_SCR(40); SHA512_SCR(41); SHA512_SCR(42); SHA512_SCR(43);
+        SHA512_SCR(44); SHA512_SCR(45); SHA512_SCR(46); SHA512_SCR(47);
+        SHA512_SCR(48); SHA512_SCR(49); SHA512_SCR(50); SHA512_SCR(51);
+        SHA512_SCR(52); SHA512_SCR(53); SHA512_SCR(54); SHA512_SCR(55);
+        SHA512_SCR(56); SHA512_SCR(57); SHA512_SCR(58); SHA512_SCR(59);
+        SHA512_SCR(60); SHA512_SCR(61); SHA512_SCR(62); SHA512_SCR(63);
+        SHA512_SCR(64); SHA512_SCR(65); SHA512_SCR(66); SHA512_SCR(67);
+        SHA512_SCR(68); SHA512_SCR(69); SHA512_SCR(70); SHA512_SCR(71);
+        SHA512_SCR(72); SHA512_SCR(73); SHA512_SCR(74); SHA512_SCR(75);
+        SHA512_SCR(76); SHA512_SCR(77); SHA512_SCR(78); SHA512_SCR(79);
+
+        wv[0] = ctx->h[0]; wv[1] = ctx->h[1];
+        wv[2] = ctx->h[2]; wv[3] = ctx->h[3];
+        wv[4] = ctx->h[4]; wv[5] = ctx->h[5];
+        wv[6] = ctx->h[6]; wv[7] = ctx->h[7];
+
+        j = 0;
+
+        do {
+            SHA512_EXP(0,1,2,3,4,5,6,7,j); j++;
+            SHA512_EXP(7,0,1,2,3,4,5,6,j); j++;
+            SHA512_EXP(6,7,0,1,2,3,4,5,j); j++;
+            SHA512_EXP(5,6,7,0,1,2,3,4,j); j++;
+            SHA512_EXP(4,5,6,7,0,1,2,3,j); j++;
+            SHA512_EXP(3,4,5,6,7,0,1,2,j); j++;
+            SHA512_EXP(2,3,4,5,6,7,0,1,j); j++;
+            SHA512_EXP(1,2,3,4,5,6,7,0,j); j++;
+        } while (j < 80);
+
+        ctx->h[0] += wv[0]; ctx->h[1] += wv[1];
+        ctx->h[2] += wv[2]; ctx->h[3] += wv[3];
+        ctx->h[4] += wv[4]; ctx->h[5] += wv[5];
+        ctx->h[6] += wv[6]; ctx->h[7] += wv[7];
+#endif /* !UNROLL_LOOPS */
+    }
+}
+
+void sha512(const unsigned char *message, unsigned int len,
+            unsigned char *digest)
+{
+    sha512_ctx ctx;
+
+    sha512_init(&ctx);
+    sha512_update(&ctx, message, len);
+    sha512_final(&ctx, digest);
+}
+
+void sha512_init(sha512_ctx *ctx)
+{
+#ifndef UNROLL_LOOPS
+    int i;
+    for (i = 0; i < 8; i++) {
+        ctx->h[i] = sha512_h0[i];
+    }
+#else
+    ctx->h[0] = sha512_h0[0]; ctx->h[1] = sha512_h0[1];
+    ctx->h[2] = sha512_h0[2]; ctx->h[3] = sha512_h0[3];
+    ctx->h[4] = sha512_h0[4]; ctx->h[5] = sha512_h0[5];
+    ctx->h[6] = sha512_h0[6]; ctx->h[7] = sha512_h0[7];
+#endif /* !UNROLL_LOOPS */
+
+    ctx->len = 0;
+    ctx->tot_len = 0;
+}
+
+void sha512_update(sha512_ctx *ctx, const unsigned char *message,
+                   unsigned int len)
+{
+    unsigned int block_nb;
+    unsigned int new_len, rem_len, tmp_len;
+    unsigned int i;
+    const unsigned char *shifted_message;
+
+    tmp_len = SHA512_BLOCK_SIZE - ctx->len;
+    rem_len = len < tmp_len ? len : tmp_len;
+
+    for (i = 0; i < rem_len; i++) {
+        ctx->block[i + ctx->len] = message[i];
+    }
+
+    if (ctx->len + len < SHA512_BLOCK_SIZE) {
+        ctx->len += len;
+        return;
+    }
+
+    new_len = len - rem_len;
+    block_nb = new_len / SHA512_BLOCK_SIZE;
+
+    shifted_message = message + rem_len;
+
+    sha512_transf(ctx, ctx->block, 1);
+    sha512_transf(ctx, shifted_message, block_nb);
+
+    rem_len = new_len % SHA512_BLOCK_SIZE;
+
+    for (i = 0; i < rem_len; i++) {
+        ctx->block[i] = shifted_message[i + (block_nb << 7)];
+    }
+
+    ctx->len = rem_len;
+    ctx->tot_len += (block_nb + 1) << 7;
+}
+
+void sha512_final(sha512_ctx *ctx, unsigned char *digest)
+{
+    unsigned int block_nb;
+    unsigned int pm_len;
+    unsigned int len_b;
+    int i;
+
+    block_nb = 1 + ((SHA512_BLOCK_SIZE - 17)
+                     < (ctx->len % SHA512_BLOCK_SIZE));
+
+    len_b = (ctx->tot_len + ctx->len) << 3;
+    pm_len = block_nb << 7;
+
+    for (i = 0; i < (int) (pm_len - ctx->len); ++i) {
+        ctx->block[i + ctx->len] = 0;
+    }
+
+    ctx->block[ctx->len] = 0x80;
+    UNPACK32(len_b, ctx->block + pm_len - 4);
+
+    sha512_transf(ctx, ctx->block, block_nb);
+
+#ifndef UNROLL_LOOPS
+    for (i = 0 ; i < 8; i++) {
+        UNPACK64(ctx->h[i], &digest[i << 3]);
+    }
+#else
+    UNPACK64(ctx->h[0], &digest[ 0]);
+    UNPACK64(ctx->h[1], &digest[ 8]);
+    UNPACK64(ctx->h[2], &digest[16]);
+    UNPACK64(ctx->h[3], &digest[24]);
+    UNPACK64(ctx->h[4], &digest[32]);
+    UNPACK64(ctx->h[5], &digest[40]);
+    UNPACK64(ctx->h[6], &digest[48]);
+    UNPACK64(ctx->h[7], &digest[56]);
+#endif /* !UNROLL_LOOPS */
 }
diff --git a/sha512.h b/sha512.h
index 0bd372c..e6d2028 100644
--- a/sha512.h
+++ b/sha512.h
@@ -1,6 +1,65 @@
+/*
+ * FIPS 180-2 SHA-224/256/384/512 implementation
+ * Last update: 02/02/2007
+ * Issue date:  04/30/2005
+ *
+ * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 #ifndef SHA512_H
 #define SHA512_H
 
-int sha512(unsigned char *out,const unsigned char *in,unsigned long long inlen);
+#include "pstdint.h"
+
+#define SHA512_DIGEST_SIZE ( 512 / 8)
+#define SHA512_BLOCK_SIZE  (1024 / 8)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    unsigned int tot_len;
+    unsigned int len;
+    unsigned char block[2 * SHA512_BLOCK_SIZE];
+    uint64_t h[8];
+} sha512_ctx;
+
+void sha512_init(sha512_ctx *ctx);
+void sha512_update(sha512_ctx *ctx, const unsigned char *message,
+                   unsigned int len);
+void sha512_final(sha512_ctx *ctx, unsigned char *digest);
+void sha512(const unsigned char *message, unsigned int len,
+            unsigned char *digest);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !SHA512_H */
 
-#endif
\ No newline at end of file
diff --git a/sign.c b/sign.c
index 891c719..f825443 100644
--- a/sign.c
+++ b/sign.c
@@ -3,36 +3,37 @@
 #include "ge.h"
 #include "sc.h"
 
-int ed25519_sign(
-  unsigned char *sm,unsigned long long *smlen,
-  const unsigned char *m,unsigned long long mlen,
-  const unsigned char *sk
-)
+
+int ed25519_sign(unsigned char *signature, const unsigned char *message, unsigned int message_len, const unsigned char *sign_key)
 {
   unsigned char az[64];
   unsigned char r[64];
   unsigned char hram[64];
   ge_p3 R;
-  unsigned long long i;
+  sha512_ctx hash;
 
-  sha512(az,sk,32);
+  sha512(sign_key, 32, az);
   az[0] &= 248;
   az[31] &= 63;
   az[31] |= 64;
 
-  *smlen = mlen + 64;
-  for (i = 0;i < mlen;++i) sm[64 + i] = m[i];
-  for (i = 0;i < 32;++i) sm[32 + i] = az[32 + i];
-  sha512(r,sm + 32,mlen + 32);
-  for (i = 0;i < 32;++i) sm[32 + i] = sk[32 + i];
+  sha512_init(&hash);
+  sha512_update(&hash, az + 32, 32);
+  sha512_update(&hash, message, message_len);
+  sha512_final(&hash, r);
 
   sc_reduce(r);
-  ge_scalarmult_base(&R,r);
-  ge_p3_tobytes(sm,&R);
+  ge_scalarmult_base(&R, r);
+  ge_p3_tobytes(signature, &R);
+
+  sha512_init(&hash);
+  sha512_update(&hash, signature, 32);
+  sha512_update(&hash, sign_key + 32, 32);
+  sha512_update(&hash, message, message_len);
+  sha512_final(&hash, hram);
 
-  sha512(hram,sm,mlen + 64);
   sc_reduce(hram);
-  sc_muladd(sm + 32,hram,az,r);
+  sc_muladd(signature + 32, hram, az, r);
 
   return 0;
 }
diff --git a/test.c b/test.c
index a6b1180..2ff5f25 100644
--- a/test.c
+++ b/test.c
@@ -1,39 +1,42 @@
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "ed25519.h"
-
-char *msg = "Hello World";
+#include <time.h>
+char msg[] = "Hello World";
 
 int main(int argc, char *argv[]) {
     unsigned char sk[64], vk[32];
-    unsigned char *sigmsg, *newmsg;
-    unsigned long long sigmsglen, newmsglen;
+    unsigned char *sigmsg;
+	FILE *f;
+
     int ret;
-    ed25519_sign_keypair(vk, sk, "0123456890123456789012");
+    ed25519_create_keypair(vk, sk, "01234567890123456789012345678901");
+
+
     printf("got keypair\n");
-    sigmsg = malloc(strlen(msg)+1+64);
+    sigmsg = malloc(64);
     if (!sigmsg)
         return 1;
-    ed25519_sign(sigmsg, &sigmsglen, (unsigned char *)msg, strlen(msg)+1, sk);
+    ed25519_sign(sigmsg, (unsigned char *)msg, strlen(msg), sk);
     printf("got signature\n");
-    if (sigmsglen != strlen(msg)+1+64)
-        return 2;
-    newmsg = malloc(sigmsglen);
-    if (!newmsg)
-        return 3;
-    ret = ed25519_sign_open(newmsg, &newmsglen, sigmsg, sigmsglen, vk);
+
+	f = fopen("sig.txt", "wb");
+	fwrite(sigmsg, 64, 1, f);
+	fclose(f);
+
+    ret = ed25519_verify(sigmsg, "Hello World", strlen(msg), vk);
     printf("verified signature\n");
     if (ret == 0)
         printf("good!\n");
     else
         printf("bad\n");
     sigmsg[0] ^= 0x01;
-    ret = ed25519_sign_open(newmsg, &newmsglen, sigmsg, sigmsglen, vk);
+    ret = ed25519_verify(sigmsg, msg, strlen(msg), vk);
     if (ret == 0) 
         printf("bad: failed to detect simple corruption\n");
     else
         printf("good: detected simple corruption\n");
+
     return 0;
 }
\ No newline at end of file
diff --git a/verify.c b/verify.c
index 70351de..b23e451 100644
--- a/verify.c
+++ b/verify.c
@@ -1,4 +1,4 @@
-int crypto_verify_32(const unsigned char *x,const unsigned char *y)
+int crypto_verify_32(const unsigned char *x, const unsigned char *y)
 {
   unsigned int differentbits = 0;
 #define F(i) differentbits |= x[i] ^ y[i];