From 43fc1c0d826a62ebbb4c69a524a14f734c52f6c6 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 29 Apr 2013 07:21:06 +0000 Subject: second attempt cleanup aes git-svn-id: http://svn.miranda-ng.org/main/trunk@4567 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/aes/aes.h | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'protocols/Skype/src/aes/aes.h') diff --git a/protocols/Skype/src/aes/aes.h b/protocols/Skype/src/aes/aes.h index af81401a0f..8bc958b410 100644 --- a/protocols/Skype/src/aes/aes.h +++ b/protocols/Skype/src/aes/aes.h @@ -1,24 +1,15 @@ -#ifndef _AES_H -#define _AES_H - -#ifndef uint8 -#define uint8 unsigned char -#endif - -#ifndef uint32 -#define uint32 unsigned long int -#endif - -typedef struct -{ - uint32 erk[64]; /* encryption round keys */ - uint32 drk[64]; /* decryption round keys */ - int nr; /* number of rounds */ -} -aes_context; - -int aes_set_key( aes_context *ctx, uint8 *key, int nbits ); -void aes_encrypt( aes_context *ctx, uint8 input[16], uint8 output[16] ); -void aes_decrypt( aes_context *ctx, uint8 input[16], uint8 output[16] ); - -#endif /* aes.h */ +#ifndef _AES_H +#define _AES_H + +typedef struct +{ + unsigned long int erk[64]; /* encryption round keys */ + unsigned long int drk[64]; /* decryption round keys */ + int nr; /* number of rounds */ +} aes_context; + +int aes_set_key(aes_context *ctx, unsigned char *key, int nbits); +void aes_encrypt(aes_context *ctx, unsigned char input[16], unsigned char output[16]); +void aes_decrypt(aes_context *ctx, unsigned char input[16], unsigned char output[16]); + +#endif /* aes.h */ -- cgit v1.2.3