diff options
author | Benjamin Kaduk <bkaduk@akamai.com> | 2017-12-07 14:14:47 -0600 |
---|---|---|
committer | Ben Kaduk <kaduk@mit.edu> | 2017-12-12 19:08:22 -0600 |
commit | af10989dd51cac1068a0451350f935fcdd54c8d3 (patch) | |
tree | 12f64b5c5b358716717cf424b94ba8463e9fd2b0 | |
parent | 1b7e60bf2e4ff225ca649206ac9f1169ee45ee13 (diff) |
Fix coverity-reported errors in ocspapitest
Avoid memory leaks in error paths, and correctly apply
parentheses to function calls in a long if-chain.
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit b6306d8049b04dca7fa738a86c892c43ba6a5fc4)
(Merged from https://github.com/openssl/openssl/pull/4723)
-rw-r--r-- | test/ocspapitest.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/test/ocspapitest.c b/test/ocspapitest.c index 2c235fb011..6d61864c41 100644 --- a/test/ocspapitest.c +++ b/test/ocspapitest.c @@ -51,7 +51,8 @@ static OCSP_BASICRESP *make_dummy_resp(void) const unsigned char namestr[] = "openssl.example.com"; unsigned char keybytes[128] = {7}; OCSP_BASICRESP *bs = OCSP_BASICRESP_new(); - OCSP_CERTID *cid; + OCSP_BASICRESP *bs_out = NULL; + OCSP_CERTID *cid = NULL; ASN1_TIME *thisupd = ASN1_TIME_set(NULL, time(NULL)); ASN1_TIME *nextupd = ASN1_TIME_set(NULL, time(NULL) + 200); X509_NAME *name = X509_NAME_new(); @@ -60,9 +61,9 @@ static OCSP_BASICRESP *make_dummy_resp(void) if (!X509_NAME_add_entry_by_NID(name, NID_commonName, MBSTRING_ASC, namestr, -1, -1, 1) - || !ASN1_BIT_STRING_set(key, keybytes, sizeof(keybytes) - || !ASN1_INTEGER_set_uint64(serial, (uint64_t)1))) - return NULL; + || !ASN1_BIT_STRING_set(key, keybytes, sizeof(keybytes)) + || !ASN1_INTEGER_set_uint64(serial, (uint64_t)1)) + goto err; cid = OCSP_cert_id_new(EVP_sha256(), name, key, serial); if (bs == NULL || thisupd == NULL @@ -71,23 +72,28 @@ static OCSP_BASICRESP *make_dummy_resp(void) || !OCSP_basic_add1_status(bs, cid, V_OCSP_CERTSTATUS_UNKNOWN, 0, NULL, thisupd, nextupd)) - return NULL; + goto err; + bs_out = bs; + bs = NULL; + err: ASN1_TIME_free(thisupd); ASN1_TIME_free(nextupd); ASN1_BIT_STRING_free(key); ASN1_INTEGER_free(serial); OCSP_CERTID_free(cid); + OCSP_BASICRESP_free(bs); X509_NAME_free(name); - return bs; + return bs_out; } #ifndef OPENSSL_NO_OCSP static int test_resp_signer(void) { - OCSP_BASICRESP *bs; + OCSP_BASICRESP *bs = NULL; X509 *signer = NULL, *tmp; EVP_PKEY *key = NULL; - STACK_OF(X509) *extra_certs; + STACK_OF(X509) *extra_certs = NULL; + int ret = 0; /* * Test a response with no certs at all; get the signer from the @@ -101,10 +107,10 @@ static int test_resp_signer(void) || !sk_X509_push(extra_certs, signer) || !OCSP_basic_sign(bs, signer, key, EVP_sha1(), NULL, OCSP_NOCERTS)) - return 0; + goto err; if (!OCSP_resp_get0_signer(bs, &tmp, extra_certs) || X509_cmp(tmp, signer) != 0) - return 0; + goto err; OCSP_BASICRESP_free(bs); /* Do it again but include the signer cert */ @@ -113,15 +119,17 @@ static int test_resp_signer(void) if (bs == NULL || !OCSP_basic_sign(bs, signer, key, EVP_sha1(), NULL, 0)) - return 0; + goto err; if (!OCSP_resp_get0_signer(bs, &tmp, NULL) || X509_cmp(tmp, signer) != 0) - return 0; + goto err; + ret = 1; + err: OCSP_BASICRESP_free(bs); sk_X509_free(extra_certs); X509_free(signer); EVP_PKEY_free(key); - return 1; + return ret; } #endif |