*/
-#include "silcincludes.h"
+#include "silc.h"
+#include "rijndael_internal.h"
#include "aes.h"
/*
SILC_CIPHER_API_SET_KEY(aes)
{
- uint32 k[8];
+ SilcUInt32 k[8];
SILC_GET_WORD_KEY(key, k, keylen);
rijndael_set_key((RijndaelContext *)context, k, keylen);
SILC_CIPHER_API_SET_KEY_WITH_STRING(aes)
{
- /* 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;
}
SILC_CIPHER_API_ENCRYPT_CBC(aes)
{
- uint32 tiv[4];
+ SilcUInt32 tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
SILC_CIPHER_API_DECRYPT_CBC(aes)
{
- uint32 tmp[4], tmp2[4], tiv[4];
+ SilcUInt32 tmp[4], tmp2[4], tiv[4];
int i;
SILC_CBC_GET_IV(tiv, iv);
for (i = 16; i < len; i += 16) {
SILC_CBC_DEC_PRE(tmp, src);
- rijndael_decrypt((RijndaelContext *)context, tmp, tmp2);
+ rijndael_decrypt((RijndaelContext *)context, tmp, tmp2);
SILC_CBC_DEC_POST(tmp2, dst, src, tmp, tiv);
}
-
+
SILC_CBC_PUT_IV(tiv, iv);
-
+
return TRUE;
}