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

#ifdef HAVE_ECC to OBJ_nid2obj, and its test in api.c

Browse Source
This commit is contained in:
Takashi Kojo
2018-07-14 10:43:45 +09:00
committed by Go Hosohara
parent 4d03b55fef
commit c673884cbb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/api.c
View File

@ -18514,8 +18514,10 @@ static void test_wolfSSL_OBJ(void)
int i, j; int i, j;
const char *f[] = { const char *f[] = {
"./certs/ca-cert.der", "./certs/ca-cert.der",
#ifdef HAVE_ECC
"./certs/ca-ecc-cert.der", "./certs/ca-ecc-cert.der",
"./certs/ca-ecc384-cert.der", "./certs/ca-ecc384-cert.der",
#endif
NULL}; NULL};
#ifndef NO_DES3 #ifndef NO_DES3
PKCS12 *p12; PKCS12 *p12;
@ -18543,6 +18545,7 @@ static void test_wolfSSL_OBJ(void)
for (i = 0; f[i] != NULL; i++) for (i = 0; f[i] != NULL; i++)
{ {
printf("file=%s\n", f[i]);
AssertTrue((fp = XFOPEN(f[i], "r")) != XBADFILE); AssertTrue((fp = XFOPEN(f[i], "r")) != XBADFILE);
AssertNotNull(x509 = d2i_X509_fp(fp, NULL)); AssertNotNull(x509 = d2i_X509_fp(fp, NULL));
AssertNotNull(x509Name = X509_get_issuer_name(x509)); AssertNotNull(x509Name = X509_get_issuer_name(x509));

5
wolfcrypt/src/asn.c
View File

@ -4098,7 +4098,7 @@ WOLFSSL_LOCAL int OBJ_sn2nid(const char *sn)
int i; int i;
WOLFSSL_ENTER("OBJ_osn2nid"); WOLFSSL_ENTER("OBJ_osn2nid");
#ifdef HAVE_ECC
/* Nginx uses this OpenSSL string. */ /* Nginx uses this OpenSSL string. */
if (XSTRNCMP(sn, "prime256v1", 10) == 0) if (XSTRNCMP(sn, "prime256v1", 10) == 0)
sn = "SECP256R1"; sn = "SECP256R1";
@ -4110,7 +4110,8 @@ WOLFSSL_LOCAL int OBJ_sn2nid(const char *sn)
return ecc_sets[i].id; return ecc_sets[i].id;
} }
} }
#endif
for(i=0; sn2nid[i].sn != NULL; i++) { for(i=0; sn2nid[i].sn != NULL; i++) {
if(XSTRNCMP(sn, sn2nid[i].sn, XSTRLEN(sn2nid[i].sn)) == 0) { if(XSTRNCMP(sn, sn2nid[i].sn, XSTRLEN(sn2nid[i].sn)) == 0) {
return sn2nid[i].nid; return sn2nid[i].nid;