projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ban timestamp handling when reading banlist from client. This has probably been...
[umurmur.git]
/
src
/
ssl.h
diff --git
a/src/ssl.h
b/src/ssl.h
index 86cd7bcd5ef5be3ee7d93ca20ed54e913bb6b5b4..f88e3017a8f80606623ba1206e28043a7bb38db5 100644
(file)
--- a/
src/ssl.h
+++ b/
src/ssl.h
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009-201
2
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
2
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-201
4
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
4
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-32,19
+32,22
@@
#ifndef SSL_H_987698
#define SSL_H_987698
#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 USE_POLARSSL
#include <polarssl/ssl.h>
#include <polarssl/version.h>
+#ifdef POLARSSL_VERSION_MAJOR
#if (POLARSSL_VERSION_MAJOR < 1)
#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
#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 { \
#if (POLARSSL_VERSION_MINOR >= 1)
#define HAVEGE_RAND (havege_random)
#define RAND_bytes(_dst_, _size_) do { \
@@
-65,7
+68,10
@@
int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
#endif
#if (POLARSSL_VERSION_MINOR >= 2)
#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 */
#endif
#else /* OpenSSL */
@@
-122,7
+128,7
@@
static inline void SSLi_hex2hash(char *in, uint8_t *hash)
int i, offset = 0;
char byte[3];
int scanned;
int i, offset = 0;
char byte[3];
int scanned;
-
+
byte[2] = '\0';
for (i = 0; i < 20; i++) {
memcpy(byte, &in[i * 2], 2);
byte[2] = '\0';
for (i = 0; i < 20; i++) {
memcpy(byte, &in[i * 2], 2);