X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=c495cc5f272daa04ad2fc1a4103a9be84452f4e1;hb=a23aee5de3a48d35b5a83a312d7aceaab0c4eaeb;hp=2aba396aae6f6d902a5f9826a597c2f05f64c2cc;hpb=fceac9f0133c4441e6c89392f4c85da3600a5183;p=umurmur.git diff --git a/src/ssl.h b/src/ssl.h index 2aba396..c495cc5 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2012, Martin Johansson - Copyright (C) 2005-2012, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -49,6 +49,7 @@ #endif #ifdef USE_POLARSSL_HAVEGE +#include #if (POLARSSL_VERSION_MINOR >= 1) #define HAVEGE_RAND (havege_random) #define RAND_bytes(_dst_, _size_) do { \ @@ -69,7 +70,10 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len); #endif #if (POLARSSL_VERSION_MINOR >= 2) - #define POLARSSL_API_V1_2 + #define POLARSSL_API_V1_2_ABOVE +#endif +#if (POLARSSL_VERSION_MINOR == 3) + #define POLARSSL_API_V1_3_ABOVE #endif #else /* OpenSSL */ @@ -126,7 +130,7 @@ static inline void SSLi_hex2hash(char *in, uint8_t *hash) int i, offset = 0; char byte[3]; int scanned; - + byte[2] = '\0'; for (i = 0; i < 20; i++) { memcpy(byte, &in[i * 2], 2);