mbedTLS 2.x support

[umurmur.git] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index 67a7cb3d235e6aa167522f6395f05c4c623282f3..2bb80e2a9b76ebe87b695a3fd6e209875c4a72b5 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -43,7 +43,7 @@
 #include <polarssl/ssl.h>
 #include <polarssl/version.h>
 
-#ifdef POLARSSL_VERSION_MAJOR
+#if defined(POLARSSL_VERSION_MAJOR)
 #if (POLARSSL_VERSION_MAJOR < 1)
 #error PolarSSL version 1.0.0 or greater is required!
 #endif
@@ -51,7 +51,7 @@
 #error PolarSSL version 1.0.0 or greater is required!
 #endif
 
-#ifdef USE_POLARSSL_HAVEGE
+#if defined(USE_POLARSSL_HAVEGE)
 #include <polarssl/havege.h>
     #if (POLARSSL_VERSION_MINOR >= 1)
         #define HAVEGE_RAND (havege_random)
@@ -80,7 +80,7 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
 #endif
 
 #define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e80 */
-#define SSLI_ERROk_WANT_WRITE -0x0F310
+#define SSLI_ERROR_WANT_WRITE -0x0F310
 
 #define SSLI_ERROR_ZERO_RETURN 0
 #define SSLI_ERROR_CONNRESET POLARSSL_ERR_NET_CONN_RESET
@@ -88,15 +88,48 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
 
 typedef        ssl_context SSL_handle_t;
 
+#elif defined(USE_MBEDTLS)
+#include <mbedtls/ssl.h>
+#include <mbedtls/net.h>
+#include <mbedtls/version.h>
+
+#if defined(MBEDTLS_VERSION_MAJOR)
+#if (MBEDTLS_VERSION_MAJOR < 2)
+#error mbedTLS version 2.0.0 or greater is required!
+#endif
+#else
+#error mbedTLS version 2.0.0 or greater is required!
+#endif
+
+#if defined(USE_MBEDTLS_HAVEGE)
+#include <mbedtls/havege.h>
+    #define HAVEGE_RAND (havege_random)
+    #define RAND_bytes(_dst_, _size_) do { \
+        mbedtls_havege_random(&hs, _dst_, _size_); \
+    } while (0)
+#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
+
+#define SSLI_ERROR_WANT_READ -0x0F300 /* mbedTLS v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e80 */
+#define SSLI_ERROR_WANT_WRITE -0x0F310
+
+#define SSLI_ERROR_ZERO_RETURN 0
+#define SSLI_ERROR_CONNRESET MBEDTLS_ERR_NET_CONN_RESET
+#define SSLI_ERROR_SYSCALL MBEDTLS_ERR_NET_RECV_FAILED
+
+typedef        mbedtls_ssl_context SSL_handle_t;
+
 #elif defined(USE_GNUTLS)
 
 #include <gnutls/gnutls.h>
 
 #define SSLI_ERROR_WANT_READ GNUTLS_E_AGAIN
 #define SSLI_ERROR_WANT_WRITE GNUTLS_E_AGAIN
-#define SSLI_ERROR_ZERO_RETURN 6 // taken from the openssl compat. layer
+#define SSLI_ERROR_ZERO_RETURN GNUTLS_E_PREMATURE_TERMINATION
 #define SSLI_ERROR_CONNRESET GNUTLS_E_PREMATURE_TERMINATION
-#define SSLI_ERROR_SYSCALL 5
+#define SSLI_ERROR_SYSCALL GNUTLS_E_PREMATURE_TERMINATION
 
 typedef gnutls_session_t SSL_handle_t;
 
@@ -148,3 +181,4 @@ static inline void SSLi_hex2hash(char *in, uint8_t *hash)
        }
 }
 #endif
+