-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#ifndef SSL_H_987698
#define SSL_H_987698
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#ifdef USE_POLARSSL
#include <polarssl/ssl.h>
#include <polarssl/version.h>
+#ifdef POLARSSL_VERSION_MAJOR
#if (POLARSSL_VERSION_MAJOR < 1)
-#error PolarSSL version 1.0.0 or later is required!
+#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
+#include <polarssl/havege.h>
#if (POLARSSL_VERSION_MINOR >= 1)
#define HAVEGE_RAND (havege_random)
#define RAND_bytes(_dst_, _size_) do { \
#endif
#if (POLARSSL_VERSION_MINOR >= 2)
- #define POLARSSL_API_V1_2
+ #define POLARSSL_API_V1_2_ABOVE
+#endif
+#if (POLARSSL_VERSION_MINOR == 3)
+ #define POLARSSL_API_V1_3_ABOVE
#endif
#else /* OpenSSL */
int i, offset = 0;
char byte[3];
int scanned;
-
+
byte[2] = '\0';
for (i = 0; i < 20; i++) {
memcpy(byte, &in[i * 2], 2);