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
/
mars.c
diff --git
a/lib/silccrypt/mars.c
b/lib/silccrypt/mars.c
index 454b402ae19881d8171448c3372fc0bd8e9ac6fd..e3c93d682d69e3ca3a1c12819c582971533f0e49 100644
(file)
--- a/
lib/silccrypt/mars.c
+++ b/
lib/silccrypt/mars.c
@@
-39,6
+39,7
@@
Mean: 373 cycles = 68.7 mbits/sec
*/
#include "silcincludes.h"
*/
#include "silcincludes.h"
+#include "mars_internal.h"
#include "mars.h"
/*
#include "mars.h"
/*
@@
-49,7
+50,7
@@
Mean: 373 cycles = 68.7 mbits/sec
SILC_CIPHER_API_SET_KEY(mars)
{
SILC_CIPHER_API_SET_KEY(mars)
{
-
ui
nt32 k[8];
+
SilcUI
nt32 k[8];
SILC_GET_WORD_KEY(key, k, keylen);
mars_set_key((MarsContext *)context, k, keylen);
SILC_GET_WORD_KEY(key, k, keylen);
mars_set_key((MarsContext *)context, k, keylen);
@@
-84,7
+85,7
@@
SILC_CIPHER_API_CONTEXT_LEN(mars)
SILC_CIPHER_API_ENCRYPT_CBC(mars)
{
SILC_CIPHER_API_ENCRYPT_CBC(mars)
{
-
ui
nt32 tiv[4];
+
SilcUI
nt32 tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
int i;
SILC_CBC_GET_IV(tiv, iv);
@@
-109,7
+110,7
@@
SILC_CIPHER_API_ENCRYPT_CBC(mars)
SILC_CIPHER_API_DECRYPT_CBC(mars)
{
SILC_CIPHER_API_DECRYPT_CBC(mars)
{
-
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);