diff options
author | tedu <> | 2014-05-25 20:28:50 +0000 |
---|---|---|
committer | tedu <> | 2014-05-25 20:28:50 +0000 |
commit | 896ee758458e7d17dd2014f065480b5085e6be10 (patch) | |
tree | 7a0bda660a181d082657a078f67d9146fbd212c2 /src/lib/libcrypto/x509 | |
parent | 339be6db68ff6f687a26e3c86aae9664fb3d0187 (diff) | |
download | openbsd-896ee758458e7d17dd2014f065480b5085e6be10.tar.gz openbsd-896ee758458e7d17dd2014f065480b5085e6be10.tar.bz2 openbsd-896ee758458e7d17dd2014f065480b5085e6be10.zip |
calloc instead of malloc/memset. from Benjamin Baier
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_vpm.c | 3 |
2 files changed, 2 insertions, 4 deletions
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) | |||
1950 | { | 1950 | { |
1951 | X509_STORE_CTX *ctx; | 1951 | X509_STORE_CTX *ctx; |
1952 | 1952 | ||
1953 | ctx = (X509_STORE_CTX *)malloc(sizeof(X509_STORE_CTX)); | 1953 | ctx = calloc(1, sizeof(X509_STORE_CTX)); |
1954 | if (!ctx) { | 1954 | if (!ctx) { |
1955 | X509err(X509_F_X509_STORE_CTX_NEW, ERR_R_MALLOC_FAILURE); | 1955 | X509err(X509_F_X509_STORE_CTX_NEW, ERR_R_MALLOC_FAILURE); |
1956 | return NULL; | 1956 | return NULL; |
1957 | } | 1957 | } |
1958 | memset(ctx, 0, sizeof(X509_STORE_CTX)); | ||
1959 | return ctx; | 1958 | return ctx; |
1960 | } | 1959 | } |
1961 | 1960 | ||
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) | |||
90 | { | 90 | { |
91 | X509_VERIFY_PARAM *param; | 91 | X509_VERIFY_PARAM *param; |
92 | 92 | ||
93 | param = malloc(sizeof(X509_VERIFY_PARAM)); | 93 | param = calloc(1, sizeof(X509_VERIFY_PARAM)); |
94 | memset(param, 0, sizeof(X509_VERIFY_PARAM)); | ||
95 | x509_verify_param_zero(param); | 94 | x509_verify_param_zero(param); |
96 | return param; | 95 | return param; |
97 | } | 96 | } |