X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.h;h=250483a57da9e021887294640bcfab926f0971ee;hb=134ce814d444d90c229d0b1777d575bc1effa718;hp=e227ed2d9a701da16980a3e3a05b33ac0c4cb8a6;hpb=6a6908d7031a79b5767d86a4da056f65a742ac9f;p=umurmur.git

diff --git a/src/crypt.h b/src/crypt.h
index e227ed2..250483a 100644
--- a/src/crypt.h
+++ b/src/crypt.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -28,11 +28,22 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef _CRYPTSTATE_H
-#define _CRYPTSTATE_H
+#ifndef CRYPTSTATE_H_34564356
+#define CRYPTSTATE_H_34564356
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef USE_POLARSSL
+#include <polarssl/havege.h>
+#include <polarssl/aes.h>
+#define AES_BLOCK_SIZE 16
+#else
 #include <openssl/rand.h>
 #include <openssl/aes.h>
+#endif
+
 #include <stdint.h>
 #include "timer.h"
 #include "types.h"
@@ -52,9 +63,13 @@ typedef struct CryptState {
 	unsigned int uiRemoteLate;
 	unsigned int uiRemoteLost;
 	unsigned int uiRemoteResync;
-	
+#ifndef USE_POLARSSL
 	AES_KEY	encrypt_key;
 	AES_KEY decrypt_key;
+#else
+	aes_context aes_enc;
+	aes_context aes_dec;
+#endif
 	etimer_t tLastGood;
 	etimer_t tLastRequest;
 	bool_t bInit;	
@@ -68,4 +83,5 @@ void CryptState_setDecryptIV(cryptState_t *cs, const unsigned char *iv);
 
 bool_t CryptState_decrypt(cryptState_t *cs, const unsigned char *source, unsigned char *dst, unsigned int crypted_length);
 void CryptState_encrypt(cryptState_t *cs, const unsigned char *source, unsigned char *dst, unsigned int plain_length);
+
 #endif