X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.h;h=5629c4c6507e468c3738c0abaeb5cbde49408ff6;hb=ddc0e8af6bbcb1f7635ea78297c5158611821aec;hp=609140ecc86e1eeb45b58f2140186d7607bea0d6;hpb=ebdd6565cbbd2db46833530112c15be0e22afc29;p=umurmur.git diff --git a/src/ssl.h b/src/ssl.h index 609140e..5629c4c 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -32,9 +32,25 @@ #ifndef SSL_H_987698 #define SSL_H_987698 +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef USE_POLARSSL #include +#include + +#ifndef POLARSSL_VERSION_MAJOR + #define POLARSSL_API_V0 #else +#if (POLARSSL_VERSION_MAJOR == 0) + #define POLARSSL_API_V0 +#else + #define POLARSSL_API_V1 +#endif +#endif + +#else /* OpenSSL */ #include #include #endif @@ -43,9 +59,14 @@ #include #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