Use generic macros from SILC Runtime.

diff --git a/lib/silccrypt/cast5.c b/lib/silccrypt/cast5.c
index 995fc09bfd2e823bff82c9a0e07b70e2953b9675..9943e8d249094ea76fba99a72cf3cefe201964a5 100644 (file)
--- a/lib/silccrypt/cast5.c
+++ b/lib/silccrypt/cast5.c
@@ -542,8 +542,7 @@ int cast5_setup(const unsigned char *key, int keylen, int num_rounds,
    return TRUE;
 }
 
-#define __ROL(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-
+#define __ROL(x, y) silc_rol(x, y)
 
 static inline SilcUInt32 FI(SilcUInt32 R, SilcUInt32 Km, SilcUInt32 Kr)
 {

diff --git a/lib/silccrypt/ciphers_def.h b/lib/silccrypt/ciphers_def.h
index 19716f4805f6802ec99e0b7579a9b07b088af17d..c550827e4ea30ada95443633df11c4fb2e7ed5ed 100644 (file)
--- a/lib/silccrypt/ciphers_def.h
+++ b/lib/silccrypt/ciphers_def.h
@@ -27,8 +27,8 @@ typedef SilcUInt32 u32;
 typedef SilcUInt32 uint_32t;
 typedef SilcUInt8 uint_8t;
 
-#define rotr(x, nr) (((x) >> ((int)(nr))) | ((x) << (32 - (int)(nr))))
-#define rotl(x, nr) (((x) << ((int)(nr))) | ((x) >> (32 - (int)(nr))))
+#define rotr(x, nr) silc_ror(x, nr)
+#define rotl(x, nr) silc_rol(x, nr)
 #define byte(x, nr) ((x) >> (nr * 8) & 255)
 
 /* Byte key to words */

diff --git a/lib/silccrypt/des.c b/lib/silccrypt/des.c
index cda0ac31f2a77df78bb116246a689d14fbc532b8..14c0e1c7091a4d08d83688ef6632d26754f63848 100644 (file)
--- a/lib/silccrypt/des.c
+++ b/lib/silccrypt/des.c
@@ -211,19 +211,8 @@ SILC_CIPHER_API_DECRYPT(3des)
 #if defined(_MSC_VER)
 #pragma intrinsic(_lrotr,_lrotl)
 #define RORc(x,n) _lrotr(x,n)
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(INTEL_CC)
-
-static inline unsigned RORc(unsigned word, int i)
-{
-   asm ("rorl %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
 #else
-#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) &0xFFFFFFFFUL)
+#define RORc(x, y) silc_ror(x, y)
 #endif /* _MSC_VER */
 
 static const SilcUInt32 bytebit[8] =

diff --git a/lib/silccrypt/sha1.c b/lib/silccrypt/sha1.c
index 6943734cb88407ea2e773b5823d95b0eab14e4a0..aadc0a251647abaedb6046a390a943b74bd87b55 100644 (file)
--- a/lib/silccrypt/sha1.c
+++ b/lib/silccrypt/sha1.c
@@ -9,7 +9,7 @@ By Steve Reid <steve@edmweb.com>
 #include "sha1_internal.h"
 #include "sha1.h"
 
-/* 
+/*
  * SILC Hash API for SHA1
  */
 
@@ -49,14 +49,9 @@ void SHA1Init(SHA1_CTX* context)
   context->count[0] = context->count[1] = 0;
 }
 
-#define rol(x, nr) (((x) << ((SilcUInt32)(nr))) | ((x) >> (32 - (SilcUInt32)(nr))))
-
-#define GET_WORD(cp) ((SilcUInt32)(SilcUInt8)(cp)[0]) << 24    \
-                   | ((SilcUInt32)(SilcUInt8)(cp)[1] << 16)    \
-                   | ((SilcUInt32)(SilcUInt8)(cp)[2] << 8)     \
-                   | ((SilcUInt32)(SilcUInt8)(cp)[3])
+#define rol(x, nr) silc_rol(x, nr)
 
-#define blk0(i) (W[i] = GET_WORD(data))
+#define blk0(i) (W[i] = SILC_GET_WORD(data))
 #define blk1(i) (W[i&15] = rol(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
 
 #define f1(x,y,z) (z^(x&(y^z)))
@@ -74,14 +69,14 @@ void SHA1Init(SHA1_CTX* context)
 void SHA1Transform(SilcUInt32 *state, const unsigned char *data)
 {
   SilcUInt32 W[16];
-  
+
   /* Copy context->state[] to working vars */
   SilcUInt32 a = state[0];
   SilcUInt32 b = state[1];
   SilcUInt32 c = state[2];
   SilcUInt32 d = state[3];
   SilcUInt32 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);
@@ -103,14 +98,14 @@ void SHA1Transform(SilcUInt32 *state, const unsigned char *data)
   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;
   memset(W, 0, sizeof(W));
@@ -143,22 +138,22 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
 {
   SilcUInt32 i, j;
   unsigned char finalcount[8];
-  
+
   for (i = 0; i < 8; i++) {
-    finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] 
+    finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
                                     >> ((3 - (i & 3)) * 8)) & 255);
   }
   SHA1Update(context, (unsigned char *)"\200", 1);
   while ((context->count[0] & 504) != 448) {
     SHA1Update(context, (unsigned char *)"\0", 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 */
   i = j = 0;
   memset(context->buffer, 0, 64);

diff --git a/lib/silccrypt/sha256.c b/lib/silccrypt/sha256.c
index 089aa87f13da8f7c91568fedbb5b2eeddd1bc1bd..0598837ec8f717a2a1af6efe97b75507c495c782 100644 (file)
--- a/lib/silccrypt/sha256.c
+++ b/lib/silccrypt/sha256.c
@@ -46,19 +46,8 @@ SILC_HASH_API_CONTEXT_LEN(sha256)
 #if defined(_MSC_VER)
 #pragma intrinsic(_lrotr,_lrotl)
 #define RORc(x,n) _lrotr(x,n)
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(INTEL_CC)
-
-static inline unsigned RORc(unsigned word, int i)
-{
-   asm ("rorl %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
 #else
-#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) &0xFFFFFFFFUL)
+#define RORc(x, y) silc_ror(x, y)
 #endif /* _MSC_VER */
 
 /* Various logical functions */