diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-08-25 13:25:58 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-02 22:05:37 -0400 |
| commit | b51bce942023325e727ca4225252d06c49d8f2b7 (patch) | |
| tree | 59bbdee7553f9132a86aca17752a9a358a6355e2 /engines | |
| parent | 66e87a9f0990198079bf4d2b3ce87581ad5b6b10 (diff) | |
| download | openssl-b51bce942023325e727ca4225252d06c49d8f2b7.zip openssl-b51bce942023325e727ca4225252d06c49d8f2b7.tar.gz openssl-b51bce942023325e727ca4225252d06c49d8f2b7.tar.bz2 | |
Add and use OPENSSL_zalloc
There are many places (nearly 50) where we malloc and then memset.
Add an OPENSSL_zalloc routine to encapsulate that.
(Missed one conversion; thanks Richard)
Also fixes GH328
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/ccgost/gost_pmeth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c index 0574d6e..e70e297 100644 --- a/engines/ccgost/gost_pmeth.c +++ b/engines/ccgost/gost_pmeth.c @@ -24,10 +24,9 @@ static int pkey_gost_init(EVP_PKEY_CTX *ctx) struct gost_pmeth_data *data; EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx); - data = OPENSSL_malloc(sizeof(*data)); + data = OPENSSL_zalloc(sizeof(*data)); if (!data) return 0; - memset(data, 0, sizeof(*data)); if (pkey && EVP_PKEY_get0(pkey)) { switch (EVP_PKEY_base_id(pkey)) { case NID_id_GostR3410_2001: @@ -309,11 +308,10 @@ static int pkey_gost_derive_init(EVP_PKEY_CTX *ctx) /* -------- PKEY_METHOD for GOST MAC algorithm --------------------*/ static int pkey_gost_mac_init(EVP_PKEY_CTX *ctx) { - struct gost_mac_pmeth_data *data = OPENSSL_malloc(sizeof(*data)); + struct gost_mac_pmeth_data *data = OPENSSL_zalloc(sizeof(*data)); if (!data) return 0; - memset(data, 0, sizeof(*data)); EVP_PKEY_CTX_set_data(ctx, data); return 1; } |