diff options
| author | PW Hu <jlu.hpw@foxmail.com> | 2021-11-10 12:39:54 +0800 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-11-22 11:18:49 +0100 |
| commit | 24ba865cfc7c04fba813ecb86ac7c1b329e3305f (patch) | |
| tree | 3505802cf7fd523acca85ca9a68a3555470fc0a4 /crypto/cms | |
| parent | f89b54460053404d85b9a91a8b6a2b30e254bdf8 (diff) | |
Fix the return check of OBJ_obj2txt
Also update OBJ_nid2obj.pod to document the possible return values.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17005)
(cherry picked from commit 2349d7ba57c9327290df6f7bc18b7f0c3976ca9e)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_dh.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_ec.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_sd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cms/cms_dh.c b/crypto/cms/cms_dh.c index fe6289b205..f14546c703 100644 --- a/crypto/cms/cms_dh.c +++ b/crypto/cms/cms_dh.c @@ -118,7 +118,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri) if (kekctx == NULL) goto err; - if (!OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0)) + if (OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0) <= 0) goto err; kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery); diff --git a/crypto/cms/cms_ec.c b/crypto/cms/cms_ec.c index 65018956a8..b07af92bad 100644 --- a/crypto/cms/cms_ec.c +++ b/crypto/cms/cms_ec.c @@ -47,7 +47,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval, pctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq); if (pctx == NULL || EVP_PKEY_paramgen_init(pctx) <= 0) goto err; - if (!OBJ_obj2txt(groupname, sizeof(groupname), poid, 0) + if (OBJ_obj2txt(groupname, sizeof(groupname), poid, 0) <= 0 || !EVP_PKEY_CTX_set_group_name(pctx, groupname)) { ERR_raise(ERR_LIB_CMS, CMS_R_DECODE_ERROR); goto err; diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 4fbe09ca5f..34c021bba6 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -784,8 +784,8 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) const CMS_CTX *ctx = si->cms_ctx; char md_name[OSSL_MAX_NAME_SIZE]; - if (!OBJ_obj2txt(md_name, sizeof(md_name), - si->digestAlgorithm->algorithm, 0)) + if (OBJ_obj2txt(md_name, sizeof(md_name), + si->digestAlgorithm->algorithm, 0) <= 0) return 0; if (CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1) < 0) { |