Major restructuring of the internals of SILC Cipher API

[crypto.git] / lib / silccrypt / sha256.c

diff --git a/lib/silccrypt/sha256.c b/lib/silccrypt/sha256.c
index 4b149a8d288508454caa6ffaaad4236c93bafbb6..00df535284ae31d8bfb1b3b32d80d6990fdd9182 100644 (file)
--- a/lib/silccrypt/sha256.c
+++ b/lib/silccrypt/sha256.c
@@ -3,7 +3,7 @@
 
 /* LibTomCrypt, modular cryptographic library -- Tom St Denis */
 
-#include "silc.h"
+#include "silccrypto.h"
 #include "sha256_internal.h"
 #include "sha256.h"
 
@@ -40,7 +40,7 @@ SILC_HASH_API_CONTEXT_LEN(sha256)
 #pragma intrinsic(_lrotr,_lrotl)
 #define RORc(x,n) _lrotr(x,n)
 #else
-#define RORc(x, y) silc_ror(x, y)
+#define RORc(x, y) silc_rorc(x, y)
 #endif /* _MSC_VER */
 
 /* Various logical functions */
@@ -53,7 +53,7 @@ SILC_HASH_API_CONTEXT_LEN(sha256)
 #define Gamma0(x)       (S(x, 7) ^ S(x, 18) ^ R(x, 3))
 #define Gamma1(x)       (S(x, 17) ^ S(x, 19) ^ R(x, 10))
 
-#ifndef SILC_SHA256_ASM
+#ifndef SILC_SHA256_X86
 
 /* Transform 512-bits */
 void  sha256_transform(SilcUInt32 *state, unsigned char *buf)
@@ -155,7 +155,7 @@ void  sha256_transform(SilcUInt32 *state, unsigned char *buf)
   }
 }
 
-#endif /* !SILC_SHA256_ASM */
+#endif /* !SILC_SHA256_X86 */
 
 int sha256_init(sha256_state * md)
 {