diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-09-03 09:15:26 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-03 16:26:34 -0400 |
| commit | 64b25758edca688a30f02c260262150f7ad0bc7d (patch) | |
| tree | 15ad5a8c7985e2b27aaf7a14737fd980a36349dd /crypto/x509 | |
| parent | fb4844bbc62fb014c115cd8fd2fc4304cba6eb89 (diff) | |
| download | openssl-64b25758edca688a30f02c260262150f7ad0bc7d.tar.gz | |
remove 0 assignments.
After openssl_zalloc, cleanup more "set to 0/NULL" assignments.
Many are from github feedback.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_lu.c | 20 | ||||
| -rw-r--r-- | crypto/x509/x_name.c | 4 |
2 files changed, 3 insertions, 21 deletions
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 2bd8de63c9..c53f1e5117 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -68,15 +68,11 @@ X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method) { X509_LOOKUP *ret; - ret = OPENSSL_malloc(sizeof(*ret)); + ret = OPENSSL_zalloc(sizeof(*ret)); if (ret == NULL) return NULL; - ret->init = 0; - ret->skip = 0; ret->method = method; - ret->method_data = NULL; - ret->store_ctx = NULL; if ((method->new_item != NULL) && !method->new_item(ret)) { OPENSSL_free(ret); return NULL; @@ -185,27 +181,15 @@ X509_STORE *X509_STORE_new(void) { X509_STORE *ret; - if ((ret = OPENSSL_malloc(sizeof(*ret))) == NULL) + if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL) return NULL; ret->objs = sk_X509_OBJECT_new(x509_object_cmp); ret->cache = 1; ret->get_cert_methods = sk_X509_LOOKUP_new_null(); - ret->verify = 0; - ret->verify_cb = 0; if ((ret->param = X509_VERIFY_PARAM_new()) == NULL) return NULL; - ret->get_issuer = 0; - ret->check_issued = 0; - ret->check_revocation = 0; - ret->get_crl = 0; - ret->check_crl = 0; - ret->cert_crl = 0; - ret->lookup_certs = 0; - ret->lookup_crls = 0; - ret->cleanup = 0; - if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE, ret, &ret->ex_data)) { sk_X509_OBJECT_free(ret->objs); OPENSSL_free(ret); diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index f8fd337cff..9bf1523a4c 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -133,7 +133,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME) static int x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it) { - X509_NAME *ret = OPENSSL_malloc(sizeof(*ret)); + X509_NAME *ret = OPENSSL_zalloc(sizeof(*ret)); if (!ret) goto memerr; @@ -141,8 +141,6 @@ static int x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it) goto memerr; if ((ret->bytes = BUF_MEM_new()) == NULL) goto memerr; - ret->canon_enc = NULL; - ret->canon_enclen = 0; ret->modified = 1; *val = (ASN1_VALUE *)ret; return 1; |