projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates. New data types.
[silc.git]
/
lib
/
silccrypt
/
mars.c
diff --git
a/lib/silccrypt/mars.c
b/lib/silccrypt/mars.c
index 31188b7157bac4fa53d8fab9833354da5d910844..addb8bd0eed80bd72b7c6a318dafdb7586832b2a 100644
(file)
--- a/
lib/silccrypt/mars.c
+++ b/
lib/silccrypt/mars.c
@@
-49,7
+49,7
@@
Mean: 373 cycles = 68.7 mbits/sec
SILC_CIPHER_API_SET_KEY(mars)
{
SILC_CIPHER_API_SET_KEY(mars)
{
- mars_set_key((MarsContext *)context, (u
nsigned int
*)key, keylen);
+ mars_set_key((MarsContext *)context, (u
int32
*)key, keylen);
return TRUE;
}
return TRUE;
}
@@
-80,13
+80,13
@@
SILC_CIPHER_API_CONTEXT_LEN(mars)
SILC_CIPHER_API_ENCRYPT_CBC(mars)
{
SILC_CIPHER_API_ENCRYPT_CBC(mars)
{
- u
nsigned int
*in, *out, *tiv;
- u
nsigned int
tmp[4];
+ u
int32
*in, *out, *tiv;
+ u
int32
tmp[4];
int i;
int i;
- in = (u
nsigned int
*)src;
- out = (u
nsigned int
*)dst;
- tiv = (u
nsigned int
*)iv;
+ in = (u
int32
*)src;
+ out = (u
int32
*)dst;
+ tiv = (u
int32
*)iv;
tmp[0] = in[0] ^ tiv[0];
tmp[1] = in[1] ^ tiv[1];
tmp[0] = in[0] ^ tiv[0];
tmp[1] = in[1] ^ tiv[1];
@@
-119,13
+119,13
@@
SILC_CIPHER_API_ENCRYPT_CBC(mars)
SILC_CIPHER_API_DECRYPT_CBC(mars)
{
SILC_CIPHER_API_DECRYPT_CBC(mars)
{
- u
nsigned int
*in, *out, *tiv;
- u
nsigned int
tmp[4], tmp2[4];
+ u
int32
*in, *out, *tiv;
+ u
int32
tmp[4], tmp2[4];
int i;
int i;
- in = (u
nsigned int
*)src;
- out = (u
nsigned int
*)dst;
- tiv = (u
nsigned int
*)iv;
+ in = (u
int32
*)src;
+ out = (u
int32
*)dst;
+ tiv = (u
int32
*)iv;
tmp[0] = in[0];
tmp[1] = in[1];
tmp[0] = in[0];
tmp[1] = in[1];