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
/
rc5.c
diff --git
a/lib/silccrypt/rc5.c
b/lib/silccrypt/rc5.c
index 1a886bee738c1b14c4ab14eac7d7c1146662dd76..dfbe7e4376e23292c2205c43e6fb90740969fb32 100644
(file)
--- a/
lib/silccrypt/rc5.c
+++ b/
lib/silccrypt/rc5.c
@@
-38,7
+38,8
@@
*
*/
*
*/
-#include "silcincludes.h"
+#include "silc.h"
+#include "rc5_internal.h"
#include "rc5.h"
/*
#include "rc5.h"
/*
@@
-49,7
+50,7
@@
SILC_CIPHER_API_SET_KEY(rc5)
{
SILC_CIPHER_API_SET_KEY(rc5)
{
-
ui
nt32 k[8];
+
SilcUI
nt32 k[8];
SILC_GET_WORD_KEY(key, k, keylen);
rc5_set_key((RC5Context *)context, k, keylen);
SILC_GET_WORD_KEY(key, k, keylen);
rc5_set_key((RC5Context *)context, k, keylen);
@@
-77,7
+78,7
@@
SILC_CIPHER_API_CONTEXT_LEN(rc5)
SILC_CIPHER_API_ENCRYPT_CBC(rc5)
{
SILC_CIPHER_API_ENCRYPT_CBC(rc5)
{
-
ui
nt32 tiv[4];
+
SilcUI
nt32 tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
int i;
SILC_CBC_GET_IV(tiv, iv);
@@
-102,7
+103,7
@@
SILC_CIPHER_API_ENCRYPT_CBC(rc5)
SILC_CIPHER_API_DECRYPT_CBC(rc5)
{
SILC_CIPHER_API_DECRYPT_CBC(rc5)
{
-
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);
@@
-138,7
+139,7
@@
SILC_CIPHER_API_DECRYPT_CBC(rc5)
/* Sets RC5 key */
/* Sets RC5 key */
-int rc5_set_key(RC5Context *ctx, const
ui
nt32 in_key[], int key_len)
+int rc5_set_key(RC5Context *ctx, const
SilcUI
nt32 in_key[], int key_len)
{
u32 i, j, k, A, B, L[c];
u32 *out_key = ctx->out_key;
{
u32 i, j, k, A, B, L[c];
u32 *out_key = ctx->out_key;