X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.c;h=ddf1f74af93dc9eff77e922e116555860aefbd79;hb=8299f488088878d38ccf7ba9bbccc4743e48bd13;hp=f3e74d8079863f7a40b334a077e6c093abacec1c;hpb=4c431fe65269e9b1d452855b9df8cfe80683b691;p=umurmur.git

diff --git a/src/crypt.c b/src/crypt.c
index f3e74d8..ddf1f74 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -43,8 +43,7 @@
 #include "crypt.h"
 #include "ssl.h"
 
-#ifdef USE_POLARSSL
-#include <polarssl/havege.h>
+#ifdef USE_POLARSSL_HAVEGE
 extern havege_state hs;
 #endif
 
@@ -200,7 +199,7 @@ bool_t CryptState_decrypt(cryptState_t *cs, const unsigned char *source, unsigne
 	CryptState_ocb_decrypt(cs, source+4, dst, plain_length, cs->decrypt_iv, tag);
 
 	if (memcmp(tag, source+1, 3) != 0) {
-		memcpy(cs->decrypt_iv, saveiv, AES_BLOCK_SIZE);		
+		memcpy(cs->decrypt_iv, saveiv, AES_BLOCK_SIZE);
 		return false;
 	}
 	cs->decrypt_history[cs->decrypt_iv[0]] = cs->decrypt_iv[1];