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

diff --git a/src/ssl.h b/src/ssl.h
index aa719af..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,43 +32,46 @@
 #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>
 
-#ifndef POLARSSL_VERSION_MAJOR
-	#define POLARSSL_API_V0
-#else
-#if (POLARSSL_VERSION_MAJOR == 0)
-	#define POLARSSL_API_V0
-    #define HAVEGE_RAND (havege_rand)
-    #define RAND_bytes(_dst_, _size_) do { \
-	    int i; \
-	    for (i = 0; i < _size_; i++) { \
-	        _dst_[i] = havege_rand(&hs); \
-	    } \
-    } while (0)
+#ifdef POLARSSL_VERSION_MAJOR
+#if (POLARSSL_VERSION_MAJOR < 1)
+#error PolarSSL version 1.0.0 or greater is required!
+#endif
 #else
-	#define POLARSSL_API_V1
+#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 { \
 	        havege_random(&hs, _dst_, _size_); \
-		} while (0)
+        } while (0)
     #else
         #define HAVEGE_RAND (havege_rand)
         #define RAND_bytes(_dst_, _size_) do { \
-	         int i; \
-	         for (i = 0; i < _size_; i++) { \
-	             _dst_[i] = havege_rand(&hs); \
-	         } \
+            int i; \
+	        for (i = 0; i < _size_; i++) { \
+	            _dst_[i] = havege_rand(&hs); \
+	        } \
         } while (0)
     #endif
+#else
+#define RAND_bytes(_dst_, _size_) do { urandom_bytes(NULL, _dst_, _size_); } while (0)
+int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
 #endif
+
+#if (POLARSSL_VERSION_MINOR >= 2)
+    #define POLARSSL_API_V1_2_ABOVE
+#endif
+#if (POLARSSL_VERSION_MINOR == 3)
+    #define POLARSSL_API_V1_3_ABOVE
 #endif
 
 #else /* OpenSSL */
@@ -83,11 +86,7 @@
 #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
 
@@ -126,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);