X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=f88e3017a8f80606623ba1206e28043a7bb38db5;hb=38763ab7cb701f7721b4b558952e85d09a935796;hp=86cd7bcd5ef5be3ee7d93ca20ed54e913bb6b5b4;hpb=3d6597697af81724a9be288af0354c987a696114;p=umurmur.git

diff --git a/src/ssl.h b/src/ssl.h
index 86cd7bc..f88e301 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,19 +32,22 @@
 #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>
 #include <polarssl/version.h>
 
+#ifdef POLARSSL_VERSION_MAJOR
 #if (POLARSSL_VERSION_MAJOR < 1)
-#error PolarSSL version 1.0.0 or later is required!
+#error PolarSSL version 1.0.0 or greater is required!
+#endif
+#else
+#error PolarSSL version 1.0.0 or greater is required!
 #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 { \
@@ -65,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 */
@@ -122,7 +128,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);