X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=4efa24beb586caccb17a01e2a43086f7e835bc29;hb=fbd95a0ede5ada1903f2ad01fda03fd8296b8029;hp=c495cc5f272daa04ad2fc1a4103a9be84452f4e1;hpb=a23aee5de3a48d35b5a83a312d7aceaab0c4eaeb;p=umurmur.git diff --git a/src/ssl.h b/src/ssl.h index c495cc5..4efa24b 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,6 +1,6 @@ /* Copyright (C) 2009-2014, Martin Johansson - Copyright (C) 2005-2014, Thorvald Natvig + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,15 +32,18 @@ #ifndef SSL_H_987698 #define SSL_H_987698 -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" +#include "types.h" -#ifdef USE_POLARSSL +#include +#include +#include + +#if defined(USE_POLARSSL) #include #include -#ifdef POLARSSL_VERSION_MAJOR +#if defined(POLARSSL_VERSION_MAJOR) #if (POLARSSL_VERSION_MAJOR < 1) #error PolarSSL version 1.0.0 or greater is required! #endif @@ -48,7 +51,7 @@ #error PolarSSL version 1.0.0 or greater is required! #endif -#ifdef USE_POLARSSL_HAVEGE +#if defined(USE_POLARSSL_HAVEGE) #include #if (POLARSSL_VERSION_MINOR >= 1) #define HAVEGE_RAND (havege_random) @@ -76,15 +79,6 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len); #define POLARSSL_API_V1_3_ABOVE #endif -#else /* OpenSSL */ -#include -#include -#endif - -#include "types.h" -#include - -#ifdef USE_POLARSSL #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 @@ -94,7 +88,21 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len); typedef ssl_context SSL_handle_t; -#else +#elif defined(USE_GNUTLS) + +#include + +#define SSLI_ERROR_WANT_READ GNUTLS_E_AGAIN +#define SSLI_ERROR_WANT_WRITE GNUTLS_E_AGAIN +#define SSLI_ERROR_ZERO_RETURN GNUTLS_E_PREMATURE_TERMINATION +#define SSLI_ERROR_CONNRESET GNUTLS_E_PREMATURE_TERMINATION +#define SSLI_ERROR_SYSCALL GNUTLS_E_PREMATURE_TERMINATION + +typedef gnutls_session_t SSL_handle_t; + +#else /* OpenSSL */ +#include +#include #define SSLI_ERROR_WANT_READ SSL_ERROR_WANT_READ #define SSLI_ERROR_WANT_WRITE SSL_ERROR_WANT_WRITE @@ -125,9 +133,10 @@ static inline void SSLi_hash2hex(uint8_t *hash, char *out) 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; + int i; char byte[3]; int scanned; @@ -139,3 +148,4 @@ static inline void SSLi_hex2hash(char *in, uint8_t *hash) } } #endif +