cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-30 00:46:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use clearer function name

Browse Source 
I went for "may be" as I was thinking just checking the tag technically
does not guarantee that what follows is correct, but I was wrong:
according to ASN.1, when there are variants, the tag does distinguish
unambiguously between variants, so we can be more positive here.
(Whether the thing inside that variant is correct is a different
question.)

As a welcome side effect, this makes the name more standard hence more
readable.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2023-08-02 12:14:19 +02:00
parent 842ffc5085
commit f1b7633443
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/pkparse.c
View File

@ -351,7 +351,7 @@ static int pk_ecc_set_pubkey(mbedtls_pk_context *pk,
* Low-level ECC parsing: optional support for SpecifiedECDomain * Low-level ECC parsing: optional support for SpecifiedECDomain
* *
* There are two functions here that are used by the rest of the code: * There are two functions here that are used by the rest of the code:
* - pk_ecc_tag_may_be_speficied_ec_domain() * - pk_ecc_tag_is_speficied_ec_domain()
* - pk_ecc_group_id_from_specified() * - pk_ecc_group_id_from_specified()
* *
* All the other functions are internal to this section. * All the other functions are internal to this section.
@ -365,7 +365,7 @@ static int pk_ecc_set_pubkey(mbedtls_pk_context *pk,
#if !defined(MBEDTLS_PK_PARSE_EC_EXTENDED) #if !defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
/* See the "real" version for documentation */ /* See the "real" version for documentation */
static int pk_ecc_tag_may_be_specified_ec_domain(int tag) static int pk_ecc_tag_is_specified_ec_domain(int tag)
{ {
(void) tag; (void) tag;
return 0; return 0;
@ -384,7 +384,7 @@ static int pk_ecc_group_id_from_specified(const mbedtls_asn1_buf *params,
* Tell if the passed tag might be the start of SpecifiedECDomain * Tell if the passed tag might be the start of SpecifiedECDomain
* (that is, a sequence). * (that is, a sequence).
*/ */
static int pk_ecc_tag_may_be_specified_ec_domain(int tag) static int pk_ecc_tag_is_specified_ec_domain(int tag)
{ {
return tag == (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE); return tag == (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE);
} }
@ -660,7 +660,7 @@ static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
/* Acceptable tags: OID for namedCurve, or specifiedECDomain */ /* Acceptable tags: OID for namedCurve, or specifiedECDomain */
params->tag = **p; params->tag = **p;
if (params->tag != MBEDTLS_ASN1_OID && if (params->tag != MBEDTLS_ASN1_OID &&
!pk_ecc_tag_may_be_specified_ec_domain(params->tag)) { !pk_ecc_tag_is_specified_ec_domain(params->tag)) {
return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT,
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG); MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
} }