Add support for PolarSSL 1.2.x

[umurmur.git] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index 5629c4c6507e468c3738c0abaeb5cbde49408ff6..d155f7f07688c35692b804a0d5a2737346b96383 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -45,8 +45,32 @@
 #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
+    #if (POLARSSL_VERSION_MINOR >= 2)
+           #define POLARSSL_API_V1_2
+    #endif
 #endif
 #endif
 
@@ -87,6 +111,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);
@@ -96,4 +121,23 @@ 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]);
+}
+static inline void SSLi_hex2hash(char *in, uint8_t *hash)
+{
+       int i, offset = 0;
+       char byte[3];
+       int scanned;
+       
+       byte[2] = '\0';
+       for (i = 0; i < 20; i++) {
+               memcpy(byte, &in[i * 2], 2);
+               sscanf(byte, "%02x", &scanned);
+               hash[i] = scanned;
+       }
+}
 #endif