diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-10 16:34:17 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:57 +0100 |
| commit | 225c9660a5a3435d9bcfc9166b9f79f132996249 (patch) | |
| tree | 31946bc12bc24f141558a542b79c31a693de2de6 /crypto | |
| parent | 89b46350a322f85924d1226f7c149e4e068d0264 (diff) | |
| download | openssl-225c9660a5a3435d9bcfc9166b9f79f132996249.zip openssl-225c9660a5a3435d9bcfc9166b9f79f132996249.tar.gz openssl-225c9660a5a3435d9bcfc9166b9f79f132996249.tar.bz2 | |
Ignore unused return values from some sk_*() macros
Some compilers are very picky about unused return values.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ex_data.c | 6 | ||||
| -rw-r--r-- | crypto/property/property.c | 2 | ||||
| -rw-r--r-- | crypto/x509/v3_addr.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x_name.c | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index cc9ebc3..c1467a5 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -445,7 +445,11 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val) return 0; } } - sk_void_set(ad->sk, idx, val); + if (sk_void_set(ad->sk, idx, val) != val) { + /* Probably the index is out of bounds */ + CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_PASSED_INVALID_ARGUMENT); + return 0; + } return 1; } diff --git a/crypto/property/property.c b/crypto/property/property.c index 608a909..c2238ac 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -316,7 +316,7 @@ int ossl_method_store_remove(OSSL_METHOD_STORE *store, int nid, if (impl->method.method == method) { impl_free(impl); - sk_IMPLEMENTATION_delete(alg->impls, i); + (void)sk_IMPLEMENTATION_delete(alg->impls, i); ossl_property_unlock(store); return 1; } diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c index 64127cf..7d4e99b 100644 --- a/crypto/x509/v3_addr.c +++ b/crypto/x509/v3_addr.c @@ -1257,7 +1257,7 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx, || addr_contains(fp->ipAddressChoice->u.addressesOrRanges, fc->ipAddressChoice->u.addressesOrRanges, length_from_afi(X509v3_addr_get_afi(fc)))) - sk_IPAddressFamily_set(child, j, fp); + (void)sk_IPAddressFamily_set(child, j, fp); else validation_err(X509_V_ERR_UNNESTED_RESOURCE); } diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index d4a085d..5520f08 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -1683,7 +1683,7 @@ static int check_policy(X509_STORE_CTX *ctx) ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain, ctx->param->policies, ctx->param->flags); if (ctx->bare_ta_signed) - sk_X509_pop(ctx->chain); + (void)sk_X509_pop(ctx->chain); if (ret == X509_PCY_TREE_INTERNAL) { X509err(X509_F_CHECK_POLICY, ERR_R_MALLOC_FAILURE); diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index 692bd65..a85b10f 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -186,7 +186,7 @@ static int x509_name_ex_d2i(ASN1_VALUE **val, entry->set = i; if (!sk_X509_NAME_ENTRY_push(nm.x->entries, entry)) goto err; - sk_X509_NAME_ENTRY_set(entries, j, NULL); + (void)sk_X509_NAME_ENTRY_set(entries, j, NULL); } } ret = x509_name_canon(nm.x); |