projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChangeLog: fix typo
[umurmur.git]
/
src
/
ssl.h
diff --git
a/src/ssl.h
b/src/ssl.h
index 67a7cb3d235e6aa167522f6395f05c4c623282f3..4efa24beb586caccb17a01e2a43086f7e835bc29 100644
(file)
--- a/
src/ssl.h
+++ b/
src/ssl.h
@@
-43,7
+43,7
@@
#include <polarssl/ssl.h>
#include <polarssl/version.h>
#include <polarssl/ssl.h>
#include <polarssl/version.h>
-#if
def POLARSSL_VERSION_MAJOR
+#if
defined(POLARSSL_VERSION_MAJOR)
#if (POLARSSL_VERSION_MAJOR < 1)
#error PolarSSL version 1.0.0 or greater is required!
#endif
#if (POLARSSL_VERSION_MAJOR < 1)
#error PolarSSL version 1.0.0 or greater is required!
#endif
@@
-51,7
+51,7
@@
#error PolarSSL version 1.0.0 or greater is required!
#endif
#error PolarSSL version 1.0.0 or greater is required!
#endif
-#if
def USE_POLARSSL_HAVEGE
+#if
defined(USE_POLARSSL_HAVEGE)
#include <polarssl/havege.h>
#if (POLARSSL_VERSION_MINOR >= 1)
#define HAVEGE_RAND (havege_random)
#include <polarssl/havege.h>
#if (POLARSSL_VERSION_MINOR >= 1)
#define HAVEGE_RAND (havege_random)
@@
-80,7
+80,7
@@
int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
#endif
#define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e80 */
#endif
#define SSLI_ERROR_WANT_READ -0x0F300 /* PolarSSL v0.x.x uses -0x0f00 -> --0x0f90, v1.x.x uses -0x7080 -> -0x7e80 */
-#define SSLI_ERRO
k
_WANT_WRITE -0x0F310
+#define SSLI_ERRO
R
_WANT_WRITE -0x0F310
#define SSLI_ERROR_ZERO_RETURN 0
#define SSLI_ERROR_CONNRESET POLARSSL_ERR_NET_CONN_RESET
#define SSLI_ERROR_ZERO_RETURN 0
#define SSLI_ERROR_CONNRESET POLARSSL_ERR_NET_CONN_RESET
@@
-94,9
+94,9
@@
typedef ssl_context SSL_handle_t;
#define SSLI_ERROR_WANT_READ GNUTLS_E_AGAIN
#define SSLI_ERROR_WANT_WRITE GNUTLS_E_AGAIN
#define SSLI_ERROR_WANT_READ GNUTLS_E_AGAIN
#define SSLI_ERROR_WANT_WRITE GNUTLS_E_AGAIN
-#define SSLI_ERROR_ZERO_RETURN
6 // taken from the openssl compat. layer
+#define SSLI_ERROR_ZERO_RETURN
GNUTLS_E_PREMATURE_TERMINATION
#define SSLI_ERROR_CONNRESET GNUTLS_E_PREMATURE_TERMINATION
#define SSLI_ERROR_CONNRESET GNUTLS_E_PREMATURE_TERMINATION
-#define SSLI_ERROR_SYSCALL
5
+#define SSLI_ERROR_SYSCALL
GNUTLS_E_PREMATURE_TERMINATION
typedef gnutls_session_t SSL_handle_t;
typedef gnutls_session_t SSL_handle_t;
@@
-148,3
+148,4
@@
static inline void SSLi_hex2hash(char *in, uint8_t *hash)
}
}
#endif
}
}
#endif
+