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)
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);
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;
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) {
if ((obj = OBJ_nid2obj(nid)) != NULL) {
char txtoid[OSSL_MAX_NAME_SIZE];
- if (OBJ_obj2txt(txtoid, sizeof(txtoid), obj, 1))
+ if (OBJ_obj2txt(txtoid, sizeof(txtoid), obj, 1) > 0)
num = ossl_namemap_add_name(arg, num, txtoid);
}
}
mac_nid = OBJ_obj2nid(pbmp->mac->algorithm);
if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, mac_nid, NULL, &hmac_md_nid, NULL)
- || !OBJ_obj2txt(hmac_mdname, sizeof(hmac_mdname),
- OBJ_nid2obj(hmac_md_nid), 0)) {
+ || OBJ_obj2txt(hmac_mdname, sizeof(hmac_mdname),
+ OBJ_nid2obj(hmac_md_nid), 0) <= 0) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_UNSUPPORTED_ALGORITHM);
goto err;
}
const OSSL_PROVIDER *prov = EVP_MD_get0_provider(md);
OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov);
- if (!OBJ_obj2txt(key_alg, sizeof(key_alg), key_oid, 0))
+ if (OBJ_obj2txt(key_alg, sizeof(key_alg), key_oid, 0) <= 0)
return 0;
return ossl_dh_kdf_X9_42_asn1(out, outlen, Z, Zlen, key_alg,
OBJ_add_sigid() returns 1 on success or 0 on error.
+OBJ_obj2txt() returns the number of bytes written to I<buf> if I<buf_len> is big enough.
+Otherwise, the result is truncated and the total amount of space required is returned.
+It also returns -1 on error.
+
=head1 EXAMPLES
Create an object for B<commonName>:
strcpy(dataname, "SM2");
else
#endif
- if (!OBJ_obj2txt(dataname, sizeof(dataname), oid, 0))
+ if (OBJ_obj2txt(dataname, sizeof(dataname), oid, 0) <= 0)
goto end;
ossl_X509_PUBKEY_INTERNAL_free(xpub);
goto end;
X509_ALGOR_get0(&oid, NULL, NULL, alg);
- if (!TEST_true(OBJ_obj2txt(name, sizeof(name), oid, 0)))
+ if (!TEST_int_gt(OBJ_obj2txt(name, sizeof(name), oid, 0), 0))
goto end;
/*
X509_ALGOR_get0(&obj, NULL, NULL, algor);
switch (idx) {
case 0:
- if (!TEST_true(OBJ_obj2txt(id, sizeof(id), obj, 0)))
+ if (!TEST_int_gt(OBJ_obj2txt(id, sizeof(id), obj, 0), 0))
goto end;
break;
case 1:
- if (!TEST_true(OBJ_obj2txt(id, sizeof(id), obj, 1)))
+ if (!TEST_int_gt(OBJ_obj2txt(id, sizeof(id), obj, 1), 0))
goto end;
break;
}
X509_ALGOR_get0(&obj, NULL, NULL, algor);
switch (idx) {
case 0:
- if (!TEST_true(OBJ_obj2txt(id, sizeof(id), obj, 0)))
+ if (!TEST_int_gt(OBJ_obj2txt(id, sizeof(id), obj, 0), 0))
goto end;
break;
case 1:
- if (!TEST_true(OBJ_obj2txt(id, sizeof(id), obj, 1)))
+ if (!TEST_int_gt(OBJ_obj2txt(id, sizeof(id), obj, 1), 0))
goto end;
break;
}