calloc instead of malloc/memset. from Benjamin Baier

26 files changed, 42 insertions, 80 deletions

diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
index 7cced4f67f..bc4027fe13 100644
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ b/src/lib/libcrypto/bn/bn_blind.c
@@ -139,11 +139,10 @@ BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
 
         bn_check_top(mod);
 
-        if ((ret = (BN_BLINDING *)malloc(sizeof(BN_BLINDING))) == NULL) {
+        if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) {
                 BNerr(BN_F_BN_BLINDING_NEW, ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
-        memset(ret, 0, sizeof(BN_BLINDING));
         if (A != NULL) {
                 if ((ret->A = BN_dup(A))  == NULL)
                         goto err;
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c
index 745c802228..64d19df663 100644
--- a/src/lib/libcrypto/comp/comp_lib.c
+++ b/src/lib/libcrypto/comp/comp_lib.c
@@ -9,11 +9,10 @@ COMP_CTX_new(COMP_METHOD *meth)
 {
         COMP_CTX *ret;
 
-        if ((ret = (COMP_CTX *)malloc(sizeof(COMP_CTX))) == NULL) {
+        if ((ret = calloc(1, sizeof(COMP_CTX))) == NULL) {
                 /* ZZZZZZZZZZZZZZZZ */
                 return (NULL);
         }
-        memset(ret, 0, sizeof(COMP_CTX));
         ret->meth = meth;
         if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
                 free(ret);
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index bd8f65b097..53aced54d5 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -1435,8 +1435,8 @@ ec_GFp_nistp224_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(felem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(felem));
                 if (mixed)
                         tmp_felems = malloc((num_points * 17 + 1) * sizeof(felem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_felems == NULL))) {
@@ -1448,8 +1448,6 @@ ec_GFp_nistp224_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /* the generator */
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index 558c29c5ba..df80cc2b8a 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -1985,8 +1985,8 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(smallfelem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(smallfelem));
                 if (mixed)
                         tmp_smallfelems = malloc((num_points * 17 + 1) * sizeof(smallfelem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_smallfelems == NULL))) {
@@ -1998,8 +1998,6 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(smallfelem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /*
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 0c40f08346..6792c5b71d 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -1872,8 +1872,8 @@ ec_GFp_nistp521_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(felem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(felem));
                 if (mixed)
                         tmp_felems = malloc((num_points * 17 + 1) * sizeof(felem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_felems == NULL))) {
@@ -1885,8 +1885,6 @@ ec_GFp_nistp521_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /*
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index e51ae51098..82c3f875f3 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -196,12 +196,10 @@ EVP_PKEY_meth_new(int id, int flags)
 {
         EVP_PKEY_METHOD *pmeth;
 
-        pmeth = malloc(sizeof(EVP_PKEY_METHOD));
+        pmeth = calloc(1, sizeof(EVP_PKEY_METHOD));
         if (!pmeth)
                 return NULL;
 
-        memset(pmeth, 0, sizeof(EVP_PKEY_METHOD));
-
         pmeth->pkey_id = id;
         pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
 
diff --git a/src/lib/libcrypto/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index 216d237b4d..fbcbd16abe 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -126,11 +126,9 @@ static int ber_new(BIO *bi)
         {
         BIO_BER_CTX *ctx;
 
-        ctx=(BIO_BER_CTX *)malloc(sizeof(BIO_BER_CTX));
+        ctx=calloc(1, sizeof(BIO_BER_CTX));
         if (ctx == NULL) return(0);
 
-        memset((char *)ctx,0,sizeof(BIO_BER_CTX));
-
         bi->init=0;
         bi->ptr=(char *)ctx;
         bi->flags=0;
diff --git a/src/lib/libcrypto/store/str_meth.c b/src/lib/libcrypto/store/str_meth.c
index 8944824618..0401aaa129 100644
--- a/src/lib/libcrypto/store/str_meth.c
+++ b/src/lib/libcrypto/store/str_meth.c
@@ -62,13 +62,11 @@
 
 STORE_METHOD *STORE_create_method(char *name)
         {
-        STORE_METHOD *store_method = (STORE_METHOD *)malloc(sizeof(STORE_METHOD));
+        STORE_METHOD *store_method = calloc(1, sizeof(STORE_METHOD));
 
         if (store_method)
-                {
-                memset(store_method, 0, sizeof(*store_method));
                 store_method->name = BUF_strdup(name);
-                }
+
         return store_method;
         }
 
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;
 }
 
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index db0ef98b72..ff548f4bb8 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -584,12 +584,11 @@ UI_set_method(UI *ui, const UI_METHOD *meth)
 UI_METHOD *
 UI_create_method(char *name)
 {
-        UI_METHOD *ui_method = (UI_METHOD *)malloc(sizeof(UI_METHOD));
+        UI_METHOD *ui_method = calloc(1, sizeof(UI_METHOD));
 
-        if (ui_method) {
-                memset(ui_method, 0, sizeof(*ui_method));
+        if (ui_method)
                 ui_method->name = BUF_strdup(name);
-        }
+
         return ui_method;
 }
 
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 0024904c20..7da415f27c 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1950,12 +1950,11 @@ X509_STORE_CTX_new(void)
 {
         X509_STORE_CTX *ctx;
 
-        ctx = (X509_STORE_CTX *)malloc(sizeof(X509_STORE_CTX));
+        ctx = calloc(1, sizeof(X509_STORE_CTX));
         if (!ctx) {
                 X509err(X509_F_X509_STORE_CTX_NEW, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
-        memset(ctx, 0, sizeof(X509_STORE_CTX));
         return ctx;
 }
 
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index f0d2a0902e..c2cebd936f 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -90,8 +90,7 @@ X509_VERIFY_PARAM_new(void)
 {
         X509_VERIFY_PARAM *param;
 
-        param = malloc(sizeof(X509_VERIFY_PARAM));
-        memset(param, 0, sizeof(X509_VERIFY_PARAM));
+        param = calloc(1, sizeof(X509_VERIFY_PARAM));
         x509_verify_param_zero(param);
         return param;
 }
diff --git a/src/lib/libssl/src/crypto/bn/bn_blind.c b/src/lib/libssl/src/crypto/bn/bn_blind.c
index 7cced4f67f..bc4027fe13 100644
--- a/src/lib/libssl/src/crypto/bn/bn_blind.c
+++ b/src/lib/libssl/src/crypto/bn/bn_blind.c
@@ -139,11 +139,10 @@ BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
 
         bn_check_top(mod);
 
-        if ((ret = (BN_BLINDING *)malloc(sizeof(BN_BLINDING))) == NULL) {
+        if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) {
                 BNerr(BN_F_BN_BLINDING_NEW, ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
-        memset(ret, 0, sizeof(BN_BLINDING));
         if (A != NULL) {
                 if ((ret->A = BN_dup(A))  == NULL)
                         goto err;
diff --git a/src/lib/libssl/src/crypto/comp/comp_lib.c b/src/lib/libssl/src/crypto/comp/comp_lib.c
index 745c802228..64d19df663 100644
--- a/src/lib/libssl/src/crypto/comp/comp_lib.c
+++ b/src/lib/libssl/src/crypto/comp/comp_lib.c
@@ -9,11 +9,10 @@ COMP_CTX_new(COMP_METHOD *meth)
 {
         COMP_CTX *ret;
 
-        if ((ret = (COMP_CTX *)malloc(sizeof(COMP_CTX))) == NULL) {
+        if ((ret = calloc(1, sizeof(COMP_CTX))) == NULL) {
                 /* ZZZZZZZZZZZZZZZZ */
                 return (NULL);
         }
-        memset(ret, 0, sizeof(COMP_CTX));
         ret->meth = meth;
         if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
                 free(ret);
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
index bd8f65b097..53aced54d5 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c
@@ -1435,8 +1435,8 @@ ec_GFp_nistp224_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(felem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(felem));
                 if (mixed)
                         tmp_felems = malloc((num_points * 17 + 1) * sizeof(felem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_felems == NULL))) {
@@ -1448,8 +1448,6 @@ ec_GFp_nistp224_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /* the generator */
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
index 558c29c5ba..df80cc2b8a 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c
@@ -1985,8 +1985,8 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(smallfelem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(smallfelem));
                 if (mixed)
                         tmp_smallfelems = malloc((num_points * 17 + 1) * sizeof(smallfelem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_smallfelems == NULL))) {
@@ -1998,8 +1998,6 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(smallfelem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /*
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
index 0c40f08346..6792c5b71d 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c
@@ -1872,8 +1872,8 @@ ec_GFp_nistp521_points_mul(const EC_GROUP * group, EC_POINT * r,
                          */
                         mixed = 1;
                 }
-                secrets = malloc(num_points * sizeof(felem_bytearray));
-                pre_comp = malloc(num_points * 17 * 3 * sizeof(felem));
+                secrets = calloc(num_points, sizeof(felem_bytearray));
+                pre_comp = calloc(num_points, 17 * 3 * sizeof(felem));
                 if (mixed)
                         tmp_felems = malloc((num_points * 17 + 1) * sizeof(felem));
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_felems == NULL))) {
@@ -1885,8 +1885,6 @@ ec_GFp_nistp521_points_mul(const EC_GROUP * group, EC_POINT * r,
                  * infinity, i.e., they contribute nothing to the linear
                  * combination
                  */
-                memset(secrets, 0, num_points * sizeof(felem_bytearray));
-                memset(pre_comp, 0, num_points * 17 * 3 * sizeof(felem));
                 for (i = 0; i < num_points; ++i) {
                         if (i == num)
                                 /*
diff --git a/src/lib/libssl/src/crypto/evp/pmeth_lib.c b/src/lib/libssl/src/crypto/evp/pmeth_lib.c
index e51ae51098..82c3f875f3 100644
--- a/src/lib/libssl/src/crypto/evp/pmeth_lib.c
+++ b/src/lib/libssl/src/crypto/evp/pmeth_lib.c
@@ -196,12 +196,10 @@ EVP_PKEY_meth_new(int id, int flags)
 {
         EVP_PKEY_METHOD *pmeth;
 
-        pmeth = malloc(sizeof(EVP_PKEY_METHOD));
+        pmeth = calloc(1, sizeof(EVP_PKEY_METHOD));
         if (!pmeth)
                 return NULL;
 
-        memset(pmeth, 0, sizeof(EVP_PKEY_METHOD));
-
         pmeth->pkey_id = id;
         pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
 
diff --git a/src/lib/libssl/src/crypto/pkcs7/bio_ber.c b/src/lib/libssl/src/crypto/pkcs7/bio_ber.c
index 216d237b4d..fbcbd16abe 100644
--- a/src/lib/libssl/src/crypto/pkcs7/bio_ber.c
+++ b/src/lib/libssl/src/crypto/pkcs7/bio_ber.c
@@ -126,11 +126,9 @@ static int ber_new(BIO *bi)
         {
         BIO_BER_CTX *ctx;
 
-        ctx=(BIO_BER_CTX *)malloc(sizeof(BIO_BER_CTX));
+        ctx=calloc(1, sizeof(BIO_BER_CTX));
         if (ctx == NULL) return(0);
 
-        memset((char *)ctx,0,sizeof(BIO_BER_CTX));
-
         bi->init=0;
         bi->ptr=(char *)ctx;
         bi->flags=0;
diff --git a/src/lib/libssl/src/crypto/store/str_meth.c b/src/lib/libssl/src/crypto/store/str_meth.c
index 8944824618..0401aaa129 100644
--- a/src/lib/libssl/src/crypto/store/str_meth.c
+++ b/src/lib/libssl/src/crypto/store/str_meth.c
@@ -62,13 +62,11 @@
 
 STORE_METHOD *STORE_create_method(char *name)
         {
-        STORE_METHOD *store_method = (STORE_METHOD *)malloc(sizeof(STORE_METHOD));
+        STORE_METHOD *store_method = calloc(1, sizeof(STORE_METHOD));
 
         if (store_method)
-                {
-                memset(store_method, 0, sizeof(*store_method));
                 store_method->name = BUF_strdup(name);
-                }
+
         return store_method;
         }
 
diff --git a/src/lib/libssl/src/crypto/ts/ts_rsp_sign.c b/src/lib/libssl/src/crypto/ts/ts_rsp_sign.c
index 0e57105858..a81d4eedf0 100644
--- a/src/lib/libssl/src/crypto/ts/ts_rsp_sign.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ts/ts_verify_ctx.c b/src/lib/libssl/src/crypto/ts/ts_verify_ctx.c
index 3fc772678c..e0803e9af9 100644
--- a/src/lib/libssl/src/crypto/ts/ts_verify_ctx.c
+++ b/src/lib/libssl/src/crypto/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;
 }
 
diff --git a/src/lib/libssl/src/crypto/ui/ui_lib.c b/src/lib/libssl/src/crypto/ui/ui_lib.c
index db0ef98b72..ff548f4bb8 100644
--- a/src/lib/libssl/src/crypto/ui/ui_lib.c
+++ b/src/lib/libssl/src/crypto/ui/ui_lib.c
@@ -584,12 +584,11 @@ UI_set_method(UI *ui, const UI_METHOD *meth)
 UI_METHOD *
 UI_create_method(char *name)
 {
-        UI_METHOD *ui_method = (UI_METHOD *)malloc(sizeof(UI_METHOD));
+        UI_METHOD *ui_method = calloc(1, sizeof(UI_METHOD));
 
-        if (ui_method) {
-                memset(ui_method, 0, sizeof(*ui_method));
+        if (ui_method)
                 ui_method->name = BUF_strdup(name);
-        }
+
         return ui_method;
 }
 
diff --git a/src/lib/libssl/src/crypto/x509/x509_vfy.c b/src/lib/libssl/src/crypto/x509/x509_vfy.c
index 0024904c20..7da415f27c 100644
--- a/src/lib/libssl/src/crypto/x509/x509_vfy.c
+++ b/src/lib/libssl/src/crypto/x509/x509_vfy.c
@@ -1950,12 +1950,11 @@ X509_STORE_CTX_new(void)
 {
         X509_STORE_CTX *ctx;
 
-        ctx = (X509_STORE_CTX *)malloc(sizeof(X509_STORE_CTX));
+        ctx = calloc(1, sizeof(X509_STORE_CTX));
         if (!ctx) {
                 X509err(X509_F_X509_STORE_CTX_NEW, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
-        memset(ctx, 0, sizeof(X509_STORE_CTX));
         return ctx;
 }
 
diff --git a/src/lib/libssl/src/crypto/x509/x509_vpm.c b/src/lib/libssl/src/crypto/x509/x509_vpm.c
index f0d2a0902e..c2cebd936f 100644
--- a/src/lib/libssl/src/crypto/x509/x509_vpm.c
+++ b/src/lib/libssl/src/crypto/x509/x509_vpm.c
@@ -90,8 +90,7 @@ X509_VERIFY_PARAM_new(void)
 {
         X509_VERIFY_PARAM *param;
 
-        param = malloc(sizeof(X509_VERIFY_PARAM));
-        memset(param, 0, sizeof(X509_VERIFY_PARAM));
+        param = calloc(1, sizeof(X509_VERIFY_PARAM));
         x509_verify_param_zero(param);
         return param;
 }