projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #62 from marcusball/master
[umurmur.git]
/
src
/
ssli_polarssl.c
diff --git
a/src/ssli_polarssl.c
b/src/ssli_polarssl.c
index df7c0070dcfbbfdd1a2192e1a402ba5ee7ef8665..167637b9d71fed4ad83787bfba2622f5bd5d7c7f 100644
(file)
--- a/
src/ssli_polarssl.c
+++ b/
src/ssli_polarssl.c
@@
-225,8
+225,12
@@
void SSLi_init(void)
Log_fatal("Cannot open /dev/urandom");
#endif
Log_fatal("Cannot open /dev/urandom");
#endif
+#ifdef POLARSSL_VERSION_FEATURES
version_get_string(verstring);
Log_info("PolarSSL library version %s initialized", verstring);
version_get_string(verstring);
Log_info("PolarSSL library version %s initialized", verstring);
+#else
+ Log_info("PolarSSL library initialized");
+#endif
}
void SSLi_deinit(void)
}
void SSLi_deinit(void)
@@
-265,12
+269,10
@@
SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
ssl_session *ssn;
int rc;
ssl_session *ssn;
int rc;
- ssl =
malloc(
sizeof(ssl_context));
- ssn =
malloc(
sizeof(ssl_session));
+ ssl =
calloc(1,
sizeof(ssl_context));
+ ssn =
calloc(1,
sizeof(ssl_session));
if (!ssl || !ssn)
Log_fatal("Out of memory");
if (!ssl || !ssn)
Log_fatal("Out of memory");
- memset(ssl, 0, sizeof(ssl_context));
- memset(ssn, 0, sizeof(ssl_session));
rc = ssl_init(ssl);
if (rc != 0 )
rc = ssl_init(ssl);
if (rc != 0 )