X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.c;h=ad93dd8bf9c5393f81e748f5c4ad526e63da3f88;hb=28fc78c510aad21897d4643e3d67a5a138bbfc3a;hp=5025ba7788dcac745f48689f99962d69cf6e9076;hpb=18d8a6a0b45e622bf18af3be30f1c60c2e1022e8;p=umurmur.git

diff --git a/src/crypt.c b/src/crypt.c
index 5025ba7..ad93dd8 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, 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];
@@ -216,34 +215,6 @@ bool_t CryptState_decrypt(cryptState_t *cs, const unsigned char *source, unsigne
 	return true;
 }
 
-#if defined(__LP64__)
-#define BLOCKSIZE 2
-#define SHIFTBITS 63
-typedef uint64_t subblock;
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define SWAPPED(x) (x)
-#else
-#ifdef __x86_64__
-#define SWAPPED(x) ({register uint64_t __out, __in = (x); __asm__("bswap %q0" : "=r"(__out) : "0"(__in)); __out;})
-#else
-#include <byteswap.h>
-#define SWAPPED(x) bswap_64(x)
-#endif
-#endif
-
-#else
-
-#define BLOCKSIZE 4
-#define SHIFTBITS 31
-typedef uint32_t subblock;
-#define SWAPPED(x) htonl(x)
-
-#endif
-
-#define HIGHBIT (1<<SHIFTBITS);
-
-
 static void inline XOR(subblock *dst, const subblock *a, const subblock *b) {
 	int i;
 	for (i=0;i<BLOCKSIZE;i++) {