projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Memory_safeCalloc() to allocate zeroed memory.
[umurmur.git]
/
src
/
ssli_polarssl.c
diff --git
a/src/ssli_polarssl.c
b/src/ssli_polarssl.c
index a36ccb6157aeb13a4d0624410abd932f79ae25e2..f5eef213dc107afe45867589e5ce35c964626337 100644
(file)
--- a/
src/ssli_polarssl.c
+++ b/
src/ssli_polarssl.c
@@
-30,6
+30,7
@@
*/
#include "conf.h"
#include "log.h"
*/
#include "conf.h"
#include "log.h"
+#include "memory.h"
#include "ssl.h"
#include <stdlib.h>
#include "ssl.h"
#include <stdlib.h>
@@
-225,8
+226,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,10
+270,8
@@
SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
ssl_session *ssn;
int rc;
ssl_session *ssn;
int rc;
- ssl = calloc(1, sizeof(ssl_context));
- ssn = calloc(1, sizeof(ssl_session));
- if (!ssl || !ssn)
- Log_fatal("Out of memory");
+ ssl = Memory_safeCalloc(1, sizeof(ssl_context));
+ ssn = Memory_safeCalloc(1, sizeof(ssl_session));
rc = ssl_init(ssl);
if (rc != 0 )
rc = ssl_init(ssl);
if (rc != 0 )