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
/
aes.c
diff --git
a/lib/silccrypt/aes.c
b/lib/silccrypt/aes.c
index 568881d62026f85991cfa67c5d6bb2818884071f..32bfc5c687b2ba5bd4ef9a0e4dc0f0befd786cff 100644
(file)
--- a/
lib/silccrypt/aes.c
+++ b/
lib/silccrypt/aes.c
@@
-40,6
+40,7
@@
Mean: 500 cycles = 51.2 mbits/sec
*/
#include "silcincludes.h"
*/
#include "silcincludes.h"
+#include "rijndael_internal.h"
#include "aes.h"
/*
#include "aes.h"
/*
@@
-50,7
+51,7
@@
Mean: 500 cycles = 51.2 mbits/sec
SILC_CIPHER_API_SET_KEY(aes)
{
SILC_CIPHER_API_SET_KEY(aes)
{
-
ui
nt32 k[8];
+
SilcUI
nt32 k[8];
SILC_GET_WORD_KEY(key, k, keylen);
rijndael_set_key((RijndaelContext *)context, k, keylen);
SILC_GET_WORD_KEY(key, k, keylen);
rijndael_set_key((RijndaelContext *)context, k, keylen);
@@
-86,7
+87,7
@@
SILC_CIPHER_API_CONTEXT_LEN(aes)
SILC_CIPHER_API_ENCRYPT_CBC(aes)
{
SILC_CIPHER_API_ENCRYPT_CBC(aes)
{
-
ui
nt32 tiv[4];
+
SilcUI
nt32 tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
int i;
SILC_CBC_GET_IV(tiv, iv);
@@
-111,7
+112,7
@@
SILC_CIPHER_API_ENCRYPT_CBC(aes)
SILC_CIPHER_API_DECRYPT_CBC(aes)
{
SILC_CIPHER_API_DECRYPT_CBC(aes)
{
-
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);