projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better logging during channel configuration.
[umurmur.git]
/
src
/
ssl.h
diff --git
a/src/ssl.h
b/src/ssl.h
index 609140ecc86e1eeb45b58f2140186d7607bea0d6..5629c4c6507e468c3738c0abaeb5cbde49408ff6 100644
(file)
--- a/
src/ssl.h
+++ b/
src/ssl.h
@@
-32,9
+32,25
@@
#ifndef SSL_H_987698
#define SSL_H_987698
#ifndef SSL_H_987698
#define SSL_H_987698
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef USE_POLARSSL
#include <polarssl/ssl.h>
#ifdef USE_POLARSSL
#include <polarssl/ssl.h>
+#include <polarssl/version.h>
+
+#ifndef POLARSSL_VERSION_MAJOR
+ #define POLARSSL_API_V0
#else
#else
+#if (POLARSSL_VERSION_MAJOR == 0)
+ #define POLARSSL_API_V0
+#else
+ #define POLARSSL_API_V1
+#endif
+#endif
+
+#else /* OpenSSL */
#include <openssl/x509v3.h>
#include <openssl/ssl.h>
#endif
#include <openssl/x509v3.h>
#include <openssl/ssl.h>
#endif
@@
-43,9
+59,14
@@
#include <inttypes.h>
#ifdef USE_POLARSSL
#include <inttypes.h>
#ifdef USE_POLARSSL
-#define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL
uses -0x0f00 -> --0x0f9
0 */
+#define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL
v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e8
0 */
#define SSLI_ERROR_WANT_WRITE -0x0F310
#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
#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
#define SSLI_ERROR_CONNRESET POLARSSL_ERR_NET_CONN_RESET
#define SSLI_ERROR_SYSCALL POLARSSL_ERR_NET_RECV_FAILED