Fix using /dev/urandom since it wasn't working

[umurmur.git] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index d155f7f07688c35692b804a0d5a2737346b96383..75b44a09c4578b482dd29ae4d1f7aafa43cb0063 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -40,38 +40,37 @@
 #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
-    #if (POLARSSL_VERSION_MINOR >= 2)
-           #define POLARSSL_API_V1_2
-    #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
 #endif
 
 #else /* OpenSSL */
@@ -86,11 +85,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