X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=2d86a0552bdcb5bc518cb2cb94932bb62f73e5a5;hb=1adc25d6aa245819d57dd817e3a34cc61ec9a37a;hp=2aba396aae6f6d902a5f9826a597c2f05f64c2cc;hpb=fceac9f0133c4441e6c89392f4c85da3600a5183;p=umurmur.git

diff --git a/src/ssl.h b/src/ssl.h
index 2aba396..2d86a05 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -32,9 +32,7 @@
 #ifndef SSL_H_987698
 #define SSL_H_987698
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #ifdef USE_POLARSSL
 #include <polarssl/ssl.h>
@@ -49,6 +47,7 @@
 #endif
 
 #ifdef USE_POLARSSL_HAVEGE
+#include <polarssl/havege.h>
     #if (POLARSSL_VERSION_MINOR >= 1)
         #define HAVEGE_RAND (havege_random)
         #define RAND_bytes(_dst_, _size_) do { \
@@ -69,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 */
@@ -123,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);