Some cleanup of SSL handling. Remove stuff related to pre PolarSSL 1.0.0.

[umurmur.git] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index aa0fe9381754d8fe9c1df157f6f569f5b69d00ba..2aba396aae6f6d902a5f9826a597c2f05f64c2cc 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -40,7 +40,14 @@
 #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
     #if (POLARSSL_VERSION_MINOR >= 1)
         #define HAVEGE_RAND (havege_random)
@@ -77,11 +84,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