Added SILC Server library.

[silc.git] / lib / silccrypt / blowfish.c

diff --git a/lib/silccrypt/blowfish.c b/lib/silccrypt/blowfish.c
index 1bea03106d4050ea5e5a119c3ee8f8a9c92d0bb2..355d64a87f5b2911d72e7c8455188bd750411711 100644 (file)
--- a/lib/silccrypt/blowfish.c
+++ b/lib/silccrypt/blowfish.c
@@ -33,7 +33,7 @@
  *
  */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "blowfish_internal.h"
 #include "blowfish.h"
 
@@ -54,14 +54,6 @@ SILC_CIPHER_API_SET_KEY(blowfish)
 
 SILC_CIPHER_API_SET_KEY_WITH_STRING(blowfish)
 {
-  /*  unsigned char key[md5_hash_len];
-  SilcMarsContext *ctx = (SilcMarsContext *)context;
-
-  make_md5_hash(string, &key);
-  memcpy(&ctx->key, mars_set_key(&key, keylen), keylen);
-  memset(&key, 'F', sizeoof(key));
-  */
-
   return 1;
 }
 
@@ -77,7 +69,7 @@ SILC_CIPHER_API_CONTEXT_LEN(blowfish)
 
 SILC_CIPHER_API_ENCRYPT_CBC(blowfish)
 {
-  uint32 tiv[4];
+  SilcUInt32 tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);
@@ -102,7 +94,7 @@ SILC_CIPHER_API_ENCRYPT_CBC(blowfish)
 
 SILC_CIPHER_API_DECRYPT_CBC(blowfish)
 {
-  uint32 tmp[4], tmp2[4], tiv[4];
+  SilcUInt32 tmp[4], tmp2[4], tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);
@@ -393,7 +385,7 @@ static u32 bf_sbox[256 * 4] =
 
 /* 
  * Round loop unrolling macros, S is a pointer to a S-Box array
- * organized in 4 uint32s at a row.
+ * organized in 4 SilcUInt32s at a row.
  */
 
 #define GET32_3(x) (((x) & 0xff))