projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silccrypt
/
rc5.c
diff --git
a/lib/silccrypt/rc5.c
b/lib/silccrypt/rc5.c
index 880d1f3f2e843aa93596fa71caeb2881482a4a86..645c88dd8182c70e6f991923fe5c92e32e33e994 100644
(file)
--- a/
lib/silccrypt/rc5.c
+++ b/
lib/silccrypt/rc5.c
@@
-39,6
+39,7
@@
*/
#include "silcincludes.h"
*/
#include "silcincludes.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);
@@
-62,14
+63,6
@@
SILC_CIPHER_API_SET_KEY(rc5)
SILC_CIPHER_API_SET_KEY_WITH_STRING(rc5)
{
SILC_CIPHER_API_SET_KEY_WITH_STRING(rc5)
{
- /* 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;
}
@@
-85,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);
@@
-110,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);
@@
-146,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;