More hash stuff fixes

[umurmur.git] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index 27920e49b414a0dab06a803b9841675d3f92a8f8..f5fa4a8229f9c8ee84d22dcb7792a28d6d5ffa92 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -38,7 +38,40 @@
 
 #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)
 #else
+       #define POLARSSL_API_V1
+    #if (POLARSSL_VERSION_MINOR >= 1)
+        #define HAVEGE_RAND (havege_random)
+        #define RAND_bytes(_dst_, _size_) do { \
+               havege_random(&hs, _dst_, _size_); \
+               } 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); \
+                } \
+        } while (0)
+    #endif
+#endif
+#endif
+
+#else /* OpenSSL */
 #include <openssl/x509v3.h>
 #include <openssl/ssl.h>
 #endif
@@ -47,9 +80,14 @@
 #include <inttypes.h>
 
 #ifdef USE_POLARSSL
-#define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL uses -0x0f00 -> --0x0f90 */
+#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
 
@@ -70,6 +108,7 @@ typedef SSL SSL_handle_t;
 void SSLi_init(void);
 void SSLi_deinit(void);
 SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready);
+bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash);
 void SSLi_closeconnection(SSL_handle_t *ssl);
 int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready);
 int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len);
@@ -79,4 +118,10 @@ bool_t SSLi_data_pending(SSL_handle_t *ssl);
 void SSLi_shutdown(SSL_handle_t *ssl);
 void SSLi_free(SSL_handle_t *ssl);
 
+static inline void SSLi_hash2hex(uint8_t *hash, char *out)
+{
+       int i, offset = 0;
+       for (i = 0; i < 20; i++)
+               offset += sprintf(out + offset, "%02x", hash[i]);
+}
 #endif