2 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 0e57105858..a81d4eedf0 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -145,11 +145,10 @@ TS_RESP_CTX_new(void)
 {
         TS_RESP_CTX *ctx;
 
-        if (!(ctx = (TS_RESP_CTX *) malloc(sizeof(TS_RESP_CTX)))) {
+        if (!(ctx = calloc(1, sizeof(TS_RESP_CTX)))) {
                 TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
-        memset(ctx, 0, sizeof(TS_RESP_CTX));
 
         /* Setting default callbacks. */
         ctx->serial_cb = def_serial_cb;
diff --git a/src/lib/libcrypto/ts/ts_verify_ctx.c b/src/lib/libcrypto/ts/ts_verify_ctx.c
index 3fc772678c..e0803e9af9 100644
--- a/src/lib/libcrypto/ts/ts_verify_ctx.c
+++ b/src/lib/libcrypto/ts/ts_verify_ctx.c
@@ -63,12 +63,11 @@
 TS_VERIFY_CTX *
 TS_VERIFY_CTX_new(void)
 {
-        TS_VERIFY_CTX *ctx = (TS_VERIFY_CTX *) malloc(sizeof(TS_VERIFY_CTX));
+        TS_VERIFY_CTX *ctx = calloc(1, sizeof(TS_VERIFY_CTX));
 
-        if (ctx)
-                memset(ctx, 0, sizeof(TS_VERIFY_CTX));
-        else
+        if (!ctx)
                 TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);
+
         return ctx;
 }