X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fblowfish.c;h=355d64a87f5b2911d72e7c8455188bd750411711;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=cf6fe609400dec5ca0973db6d342cb1188b62abe;hpb=4a474e9a2bd781802b9adfc7cac1f32e5e1c4704;p=silc.git

diff --git a/lib/silccrypt/blowfish.c b/lib/silccrypt/blowfish.c
index cf6fe609..355d64a8 100644
--- a/lib/silccrypt/blowfish.c
+++ b/lib/silccrypt/blowfish.c
@@ -33,7 +33,8 @@
  *
  */
 
-#include "silcincludes.h"
+#include "silc.h"
+#include "blowfish_internal.h"
 #include "blowfish.h"
 
 /* 
@@ -53,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;
 }
 
@@ -76,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);
@@ -101,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);
@@ -392,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))