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

diff --git a/src/ssl.h b/src/ssl.h
index aa0fe93..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,16 +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>
 
-#define POLARSSL_API_V1
+#ifdef POLARSSL_VERSION_MAJOR
+#if (POLARSSL_VERSION_MAJOR < 1)
+#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 { \
@@ -62,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 */
@@ -77,11 +86,7 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
 #define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e80 */
 #define SSLI_ERROR_WANT_WRITE -0x0F310
 
-#ifdef POLARSSL_API_V1
 #define SSLI_ERROR_ZERO_RETURN 0
-#else
-#define SSLI_ERROR_ZERO_RETURN POLARSSL_ERR_NET_CONN_RESET
-#endif
 #define SSLI_ERROR_CONNRESET POLARSSL_ERR_NET_CONN_RESET
 #define SSLI_ERROR_SYSCALL POLARSSL_ERR_NET_RECV_FAILED
 
@@ -120,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);