wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

OBJ_sn2nid: use correct short names

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2024-12-31 12:50:04 +01:00
parent 8d7c60017c
commit 3cb2bb3759
2 changed files with 7 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/ssl.c
View File

@ -202,79 +202,20 @@
*
* For OpenSSL compatibility.
*
* This function shouldn't exist!
* Uses defines in wolfssl/openssl/evp.h.
* Uses EccEnumToNID which uses defines in wolfssl/openssl/ec.h.
*
* @param [in] sn Short name of OID.
* @return NID corresponding to shortname on success.
* @return WC_NID_undef when not recognized.
*/
int wc_OBJ_sn2nid(const char *sn)
{
const struct {
const char *sn;
int nid;
} sn2nid[] = {
#ifndef NO_CERTS
{WOLFSSL_COMMON_NAME, WC_NID_commonName},
{WOLFSSL_COUNTRY_NAME, WC_NID_countryName},
{WOLFSSL_LOCALITY_NAME, WC_NID_localityName},
{WOLFSSL_STATE_NAME, WC_NID_stateOrProvinceName},
{WOLFSSL_ORG_NAME, WC_NID_organizationName},
{WOLFSSL_ORGUNIT_NAME, WC_NID_organizationalUnitName},
#ifdef WOLFSSL_CERT_NAME_ALL
{WOLFSSL_NAME, WC_NID_name},
{WOLFSSL_INITIALS, WC_NID_initials},
{WOLFSSL_GIVEN_NAME, WC_NID_givenName},
{WOLFSSL_DNQUALIFIER, WC_NID_dnQualifier},
#endif
{WOLFSSL_EMAIL_ADDR, WC_NID_emailAddress},
#endif
{"SHA1", WC_NID_sha1},
{NULL, -1}};
int i;
#ifdef HAVE_ECC
char curveName[ECC_MAXNAME + 1];
int eccEnum;
#endif
const WOLFSSL_ObjectInfo *obj_info = wolfssl_object_info;
size_t i;
WOLFSSL_ENTER("wc_OBJ_sn2nid");
for(i=0; sn2nid[i].sn != NULL; i++) {
if (XSTRCMP(sn, sn2nid[i].sn) == 0) {
return sn2nid[i].nid;
}
for (i = 0; i < wolfssl_object_info_sz; i++, obj_info++) {
if (XSTRCMP(sn, obj_info->sName) == 0)
return obj_info->nid;
}
#ifdef HAVE_ECC
if (XSTRLEN(sn) > ECC_MAXNAME)
return WC_NID_undef;
/* Nginx uses this OpenSSL string. */
if (XSTRCMP(sn, "prime256v1") == 0)
sn = "SECP256R1";
/* OpenSSL allows lowercase curve names */
for (i = 0; i < (int)(sizeof(curveName) - 1) && *sn; i++) {
curveName[i] = (char)XTOUPPER((unsigned char) *sn++);
}
curveName[i] = '\0';
/* find based on name and return NID */
for (i = 0;
#ifndef WOLFSSL_ECC_CURVE_STATIC
ecc_sets[i].size != 0 && ecc_sets[i].name != NULL;
#else
ecc_sets[i].size != 0;
#endif
i++) {
if (XSTRCMP(curveName, ecc_sets[i].name) == 0) {
eccEnum = ecc_sets[i].id;
/* Convert enum value in ecc_curve_id to OpenSSL NID */
return EccEnumToNID(eccEnum);
}
}
#endif /* HAVE_ECC */
WOLFSSL_MSG("short name not found in table");
return WC_NID_undef;
}
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */

6
tests/api.c
View File

@ -76143,14 +76143,10 @@ static int test_wolfSSL_OBJ_sn(void)
NID_stateOrProvinceName,NID_organizationName,
NID_organizationalUnitName,NID_emailAddress};
const char* sn_open_set[] = {"CN","C","L","ST","O","OU","emailAddress"};
const char* sn_wolf_set[] = {WOLFSSL_COMMON_NAME,WOLFSSL_COUNTRY_NAME,
WOLFSSL_LOCALITY_NAME, WOLFSSL_STATE_NAME,
WOLFSSL_ORG_NAME, WOLFSSL_ORGUNIT_NAME,
WOLFSSL_EMAIL_ADDR};
ExpectIntEQ(wolfSSL_OBJ_sn2nid(NULL), NID_undef);
for (i = 0; i < maxIdx; i++) {
ExpectIntEQ(wolfSSL_OBJ_sn2nid(sn_wolf_set[i]), nid_set[i]);
ExpectIntEQ(wolfSSL_OBJ_sn2nid(sn_open_set[i]), nid_set[i]);
ExpectStrEQ(wolfSSL_OBJ_nid2sn(nid_set[i]), sn_open_set[i]);
}