projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SILC Server library.
[silc.git]
/
lib
/
silccrypt
/
cast.c
diff --git
a/lib/silccrypt/cast.c
b/lib/silccrypt/cast.c
index b3428cb2301e0fe5712227d42b2d11541dcfdd78..d7f42ecfdded43140734518ae7624785c8850a50 100644
(file)
--- a/
lib/silccrypt/cast.c
+++ b/
lib/silccrypt/cast.c
@@
-58,7
+58,7
@@
Mean: 674 cycles = 38.0 mbits/sec
*/
*/
-#include "silc
includes
.h"
+#include "silc.h"
#include "cast_internal.h"
#include "cast.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)
{
SILC_CIPHER_API_SET_KEY(cast)
{
-
ui
nt32 k[8];
+
SilcUI
nt32 k[8];
SILC_GET_WORD_KEY(key, k, keylen);
cast_set_key((CastContext *)context, k, keylen);
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)
{
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;
}
return 1;
}
@@
-108,7
+100,7
@@
SILC_CIPHER_API_CONTEXT_LEN(cast)
SILC_CIPHER_API_ENCRYPT_CBC(cast)
{
SILC_CIPHER_API_ENCRYPT_CBC(cast)
{
-
ui
nt32 tiv[4];
+
SilcUI
nt32 tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
int i;
SILC_CBC_GET_IV(tiv, iv);
@@
-133,7
+125,7
@@
SILC_CIPHER_API_ENCRYPT_CBC(cast)
SILC_CIPHER_API_DECRYPT_CBC(cast)
{
SILC_CIPHER_API_DECRYPT_CBC(cast)
{
-
ui
nt32 tmp[4], tmp2[4], tiv[4];
+
SilcUI
nt32 tmp[4], tmp2[4], tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
int i;
SILC_CBC_GET_IV(tiv, iv);