summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts
diff options
context:
space:
mode:
authortedu <>2014-05-25 20:28:50 +0000
committertedu <>2014-05-25 20:28:50 +0000
commit896ee758458e7d17dd2014f065480b5085e6be10 (patch)
tree7a0bda660a181d082657a078f67d9146fbd212c2 /src/lib/libcrypto/ts
parent339be6db68ff6f687a26e3c86aae9664fb3d0187 (diff)
downloadopenbsd-896ee758458e7d17dd2014f065480b5085e6be10.tar.gz
openbsd-896ee758458e7d17dd2014f065480b5085e6be10.tar.bz2
openbsd-896ee758458e7d17dd2014f065480b5085e6be10.zip
calloc instead of malloc/memset. from Benjamin Baier
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_sign.c3
-rw-r--r--src/lib/libcrypto/ts/ts_verify_ctx.c7
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)
145{ 145{
146 TS_RESP_CTX *ctx; 146 TS_RESP_CTX *ctx;
147 147
148 if (!(ctx = (TS_RESP_CTX *) malloc(sizeof(TS_RESP_CTX)))) { 148 if (!(ctx = calloc(1, sizeof(TS_RESP_CTX)))) {
149 TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE); 149 TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE);
150 return NULL; 150 return NULL;
151 } 151 }
152 memset(ctx, 0, sizeof(TS_RESP_CTX));
153 152
154 /* Setting default callbacks. */ 153 /* Setting default callbacks. */
155 ctx->serial_cb = def_serial_cb; 154 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 @@
63TS_VERIFY_CTX * 63TS_VERIFY_CTX *
64TS_VERIFY_CTX_new(void) 64TS_VERIFY_CTX_new(void)
65{ 65{
66 TS_VERIFY_CTX *ctx = (TS_VERIFY_CTX *) malloc(sizeof(TS_VERIFY_CTX)); 66 TS_VERIFY_CTX *ctx = calloc(1, sizeof(TS_VERIFY_CTX));
67 67
68 if (ctx) 68 if (!ctx)
69 memset(ctx, 0, sizeof(TS_VERIFY_CTX));
70 else
71 TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE); 69 TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);
70
72 return ctx; 71 return ctx;
73} 72}
74 73