X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.c;h=ad93dd8bf9c5393f81e748f5c4ad526e63da3f88;hb=230ab44eae2e9379a093078b028923b7477f4425;hp=89fe19d246490eb291dc27f8ac78732a27ef9edd;hpb=808f6f490d6e93002b5ac8e0ba201aa82b128fc4;p=umurmur.git diff --git a/src/crypt.c b/src/crypt.c index 89fe19d..ad93dd8 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -199,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]; @@ -215,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 -#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<