From ae8259343df8cf5dfbe5eda22c58c222d36a5499 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 21 Sep 2015 17:37:40 -0700 Subject: [PATCH] Switch to safe calloc wrapper The mbedTLS backend was still using plain calloc. I refactored the code to use the new safe calloc wrapper. --- src/ssli_mbedtls.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ssli_mbedtls.c b/src/ssli_mbedtls.c index 04efd17..a843d97 100644 --- a/src/ssli_mbedtls.c +++ b/src/ssli_mbedtls.c @@ -32,6 +32,7 @@ #include "conf.h" #include "log.h" #include "ssl.h" +#include "memory.h" #include #include @@ -205,7 +206,7 @@ void SSLi_init(void) #endif /* Initialize config */ - conf = calloc(1, sizeof(mbedtls_ssl_config)); + conf = Memory_safeCalloc(1, sizeof(mbedtls_ssl_config)); if (!conf) Log_fatal("Out of memory"); @@ -271,8 +272,8 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) mbedtls_ssl_session *ssn; int rc; - ssl = calloc(1, sizeof(mbedtls_ssl_context)); - ssn = calloc(1, sizeof(mbedtls_ssl_session)); + ssl = Memory_safeCalloc(1, sizeof(mbedtls_ssl_context)); + ssn = Memory_safeCalloc(1, sizeof(mbedtls_ssl_session)); if (!ssl || !ssn) Log_fatal("Out of memory"); @@ -280,7 +281,7 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) mbedtls_ssl_init(ssl); mbedtls_ssl_set_bio(ssl, fd, mbedtls_net_send, mbedtls_net_recv, NULL); mbedtls_ssl_set_session(ssl, ssn); - + if((rc = mbedtls_ssl_setup(ssl, conf)) != 0) Log_fatal("mbedtls_ssl_setup returned %d", rc); -- 2.30.2