X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=2d86a0552bdcb5bc518cb2cb94932bb62f73e5a5;hb=1adc25d6aa245819d57dd817e3a34cc61ec9a37a;hp=3b310cc4b4425761f2eca39497f4dbf8f8c90a1a;hpb=134ce814d444d90c229d0b1777d575bc1effa718;p=umurmur.git diff --git a/src/ssl.h b/src/ssl.h index 3b310cc..2d86a05 100644 --- a/src/ssl.h +++ b/src/ssl.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. @@ -32,9 +32,7 @@ #ifndef SSL_H_987698 #define SSL_H_987698 -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #ifdef USE_POLARSSL #include @@ -70,7 +68,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 */ @@ -124,10 +125,10 @@ static inline void SSLi_hash2hex(uint8_t *hash, char *out) } static inline void SSLi_hex2hash(char *in, uint8_t *hash) { - int i, offset = 0; + int i; char byte[3]; int scanned; - + byte[2] = '\0'; for (i = 0; i < 20; i++) { memcpy(byte, &in[i * 2], 2);