X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fcast.c;h=d7f42ecfdded43140734518ae7624785c8850a50;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=b3428cb2301e0fe5712227d42b2d11541dcfdd78;hpb=ee9ad49e68cd69759ca643579c2f0de0747c4f61;p=silc.git

diff --git a/lib/silccrypt/cast.c b/lib/silccrypt/cast.c
index b3428cb2..d7f42ecf 100644
--- a/lib/silccrypt/cast.c
+++ b/lib/silccrypt/cast.c
@@ -58,7 +58,7 @@ Mean:          674 cycles =    38.0 mbits/sec
 
 */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "cast_internal.h"
 #include "cast.h"
 
@@ -72,7 +72,7 @@ Mean:          674 cycles =    38.0 mbits/sec
 
 SILC_CIPHER_API_SET_KEY(cast)
 {
-  uint32 k[8];
+  SilcUInt32 k[8];
 
   SILC_GET_WORD_KEY(key, k, keylen);
   cast_set_key((CastContext *)context, k, keylen);
@@ -85,14 +85,6 @@ SILC_CIPHER_API_SET_KEY(cast)
 
 SILC_CIPHER_API_SET_KEY_WITH_STRING(cast)
 {
-  /*  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;
 }
 
@@ -108,7 +100,7 @@ SILC_CIPHER_API_CONTEXT_LEN(cast)
 
 SILC_CIPHER_API_ENCRYPT_CBC(cast)
 {
-  uint32 tiv[4];
+  SilcUInt32 tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);
@@ -133,7 +125,7 @@ SILC_CIPHER_API_ENCRYPT_CBC(cast)
 
 SILC_CIPHER_API_DECRYPT_CBC(cast)
 {
-  uint32 tmp[4], tmp2[4], tiv[4];
+  SilcUInt32 tmp[4], tmp2[4], tiv[4];
   int i;
 
   SILC_CBC_GET_IV(tiv, iv);