mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Permit no/empty digest in core_obj_add_sigid

Browse Source 
Also add digest parameter documentation for add_sigid and
permit NULL as digest name in the provider upcall.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16770)
This commit is contained in:
Michael Baentsch 2021-10-07 10:45:48 +02:00 committed by Tomas Mraz
parent 25ead551aa
commit 4f71624964
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/objects/obj_xref.c
View File

@ -141,7 +141,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
nid_triple *ntr;
int dnid = NID_undef, pnid = NID_undef, ret = 0;
if (signid == NID_undef || dig_id == NID_undef || pkey_id == NID_undef)
if (signid == NID_undef || pkey_id == NID_undef)
return 0;
if (!obj_sig_init())

9
crypto/provider_core.c
View File

@ -1933,9 +1933,13 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
const char *pkey_name)
{
int sign_nid = OBJ_txt2nid(sign_name);
int digest_nid = OBJ_txt2nid(digest_name);
int digest_nid = NID_undef;
int pkey_nid = OBJ_txt2nid(pkey_name);
if (digest_name != NULL && digest_name[0] != '\0'
&& (digest_nid = OBJ_txt2nid(digest_name)) == NID_undef)
return 0;
if (sign_nid == NID_undef)
return 0;
@ -1946,8 +1950,7 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
if (OBJ_find_sigid_algs(sign_nid, NULL, NULL))
return 1;
if (digest_nid == NID_undef
|| pkey_nid == NID_undef)
if (pkey_nid == NID_undef)
return 0;
return OBJ_add_sigid(sign_nid, digest_nid, pkey_nid);

3
doc/man3/OBJ_nid2obj.pod
View File

@ -99,7 +99,8 @@ given NID with two other NIDs - one representing the underlying signature
algorithm and the other representing a digest algorithm to be used in
conjunction with it. I<signid> represents the NID for the composite "Signature
Algorithm", I<dig_id> is the NID for the digest algorithm and I<pkey_id> is the
NID for the underlying signature algorithm.
NID for the underlying signature algorithm. As there are signature algorithms
that do not require a digest, NID_undef is a valid I<dig_id>.
OBJ_cleanup() releases any resources allocated by creating new objects.

5
doc/man7/provider-base.pod
View File

@ -284,8 +284,9 @@ function L<OBJ_add_sigid(3)>, except that the objects are identified by name
rather than a numeric NID. Any name (OID, short name or long name) can be used
to identify the object. It will treat as success the case where the composite
signature algorithm already exists (even if registered against a different
underlying signature or digest algorithm). It returns 1 on success or 0 on
failure.
underlying signature or digest algorithm). For I<digest_name>, NULL or an
empty string is permissible for signature algorithms that do not need a digest
to operate correctly. The function returns 1 on success or 0 on failure.
CRYPTO_malloc(), CRYPTO_zalloc(), CRYPTO_memdup(), CRYPTO_strdup(),
CRYPTO_strndup(), CRYPTO_free(), CRYPTO_clear_free(),

9
test/upcallstest.c
View File

@ -68,6 +68,15 @@ static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
if (!c_obj_add_sigid(handle, SIGALG_OID, DIGEST_SN, SIG_LN))
return 0;
/* additional tests checking empty digest algs are accepted, too */
if (!c_obj_add_sigid(handle, SIGALG_OID, "", SIG_LN))
return 0;
if (!c_obj_add_sigid(handle, SIGALG_OID, NULL, SIG_LN))
return 0;
/* checking wrong digest alg name is rejected: */
if (c_obj_add_sigid(handle, SIGALG_OID, "NonsenseAlg", SIG_LN))
return 0;
return 1;
}