X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fcrypt.h;h=0a4030c8b6c462a768c3097d513332fdc9a56a5d;hb=21d88cde9cf17f177e506badeaf0e512290e09e0;hp=250483a57da9e021887294640bcfab926f0971ee;hpb=134ce814d444d90c229d0b1777d575bc1effa718;p=umurmur.git diff --git a/src/crypt.h b/src/crypt.h index 250483a..0a4030c 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2013, Martin Johansson - Copyright (C) 2005-2013, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -31,9 +31,8 @@ #ifndef CRYPTSTATE_H_34564356 #define CRYPTSTATE_H_34564356 -#ifdef HAVE_CONFIG_H -#include -#endif +#include "byteorder.h" +#include "config.h" #ifdef USE_POLARSSL #include @@ -53,12 +52,12 @@ typedef struct CryptState { uint8_t encrypt_iv[AES_BLOCK_SIZE]; uint8_t decrypt_iv[AES_BLOCK_SIZE]; uint8_t decrypt_history[0x100]; - + unsigned int uiGood; unsigned int uiLate; unsigned int uiLost; unsigned int uiResync; - + unsigned int uiRemoteGood; unsigned int uiRemoteLate; unsigned int uiRemoteLost; @@ -72,7 +71,7 @@ typedef struct CryptState { #endif etimer_t tLastGood; etimer_t tLastRequest; - bool_t bInit; + bool_t bInit; } cryptState_t; void CryptState_init(cryptState_t *cs);