summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-05-29 16:42:04 +0000
committertedu <>2014-05-29 16:42:04 +0000
commitae0ce0220b48c9c13ba862895db6bca27d6446db (patch)
tree942006e51e4b2364b022f3dd07bf15eb33b2a549 /src
parent523d54282c543c650be946602c618cf48ec008de (diff)
downloadopenbsd-ae0ce0220b48c9c13ba862895db6bca27d6446db.tar.gz
openbsd-ae0ce0220b48c9c13ba862895db6bca27d6446db.tar.bz2
openbsd-ae0ce0220b48c9c13ba862895db6bca27d6446db.zip
use calloc, from Benjamin Baier
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/store/str_lib.c6
-rw-r--r--src/lib/libssl/src/crypto/store/str_lib.c6
2 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c
index f9beab2952..c50620308a 100644
--- a/src/lib/libcrypto/store/str_lib.c
+++ b/src/lib/libcrypto/store/str_lib.c
@@ -1174,11 +1174,7 @@ STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
1174STORE_OBJECT * 1174STORE_OBJECT *
1175STORE_OBJECT_new(void) 1175STORE_OBJECT_new(void)
1176{ 1176{
1177 STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); 1177 return calloc(1, sizeof(STORE_OBJECT));
1178
1179 if (object)
1180 memset(object, 0, sizeof(STORE_OBJECT));
1181 return object;
1182} 1178}
1183 1179
1184void 1180void
diff --git a/src/lib/libssl/src/crypto/store/str_lib.c b/src/lib/libssl/src/crypto/store/str_lib.c
index f9beab2952..c50620308a 100644
--- a/src/lib/libssl/src/crypto/store/str_lib.c
+++ b/src/lib/libssl/src/crypto/store/str_lib.c
@@ -1174,11 +1174,7 @@ STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
1174STORE_OBJECT * 1174STORE_OBJECT *
1175STORE_OBJECT_new(void) 1175STORE_OBJECT_new(void)
1176{ 1176{
1177 STORE_OBJECT *object = malloc(sizeof(STORE_OBJECT)); 1177 return calloc(1, sizeof(STORE_OBJECT));
1178
1179 if (object)
1180 memset(object, 0, sizeof(STORE_OBJECT));
1181 return object;
1182} 1178}
1183 1179
1184void 1180void