X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.c;h=ddf1f74af93dc9eff77e922e116555860aefbd79;hb=ce0029a0c689d9b96d6a797a2e46aa0bee712e36;hp=5025ba7788dcac745f48689f99962d69cf6e9076;hpb=18d8a6a0b45e622bf18af3be30f1c60c2e1022e8;p=umurmur.git diff --git a/src/crypt.c b/src/crypt.c index 5025ba7..ddf1f74 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2011, Martin Johansson - Copyright (C) 2005-2011, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -43,8 +43,7 @@ #include "crypt.h" #include "ssl.h" -#ifdef USE_POLARSSL -#include +#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];