wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-28 23:59:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

OBJ_sn2nid with OPENSSL_EXTRA_X509_SMALL

Browse Source
This commit is contained in:
Takashi Kojo
2018-07-21 14:58:29 +09:00
committed by Go Hosohara
parent 094141b4ea
commit 9ae3ccb3ba
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@@ -30203,6 +30203,8 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
return NULL;
}
obj->dynamic |= WOLFSSL_ASN1_DYNAMIC_DATA ;
} else {
obj->dynamic &= ~WOLFSSL_ASN1_DYNAMIC_DATA ;
}
XMEMCPY(obj->obj, objBuf, obj->objSz);

5
tests/api.c
View File

@@ -18565,8 +18565,9 @@ static void test_wolfSSL_OBJ(void)
AssertTrue((nid = OBJ_obj2nid(asn1Name)) > 0);
}
BIO_free(bio);
X509_free(x509);
ASN1_OBJECT_free(asn1Name);
X509_free(x509);
}
for (i = 0; p12_f[i] != NULL; i++)
@@ -18586,8 +18587,8 @@ static void test_wolfSSL_OBJ(void)
AssertTrue((nid = OBJ_obj2nid(asn1Name)) > 0);
}
BIO_free(bio);
X509_free(x509);
ASN1_OBJECT_free(asn1Name);
X509_free(x509);
}
printf(resultFmt, passed);

6
wolfcrypt/src/asn.c
View File

@@ -104,7 +104,7 @@ ASN Options:
#include <wolfssl/wolfcrypt/rsa.h>
#endif
#ifdef OPENSSL_EXTRA
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA_X509_SMALL)
#include <wolfssl/openssl/ssl.h> /* for OBJ_sn2nid */
#endif
@@ -4090,10 +4090,10 @@ WOLFSSL_LOCAL int OBJ_sn2nid(const char *sn)
{WOLFSSL_COMMON_NAME, NID_commonName},
{WOLFSSL_COUNTRY_NAME, NID_countryName},
{WOLFSSL_LOCALITY_NAME, NID_localityName},
{"/ST", NID_stateOrProvinceName},
{WOLFSSL_STATE_NAME, NID_stateOrProvinceName},
{WOLFSSL_ORG_NAME, NID_organizationName},
{WOLFSSL_ORGUNIT_NAME, NID_organizationalUnitName},
{"/emailAddress", NID_emailAddress},
{WOLFSSL_EMAIL_ADDR, NID_emailAddress},
{NULL, -1}};
int i;

1
wolfssl/openssl/ssl.h
View File

@@ -587,6 +587,7 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX;
/* NIDs */
enum {
NID_undef = 0,
NID_des = 66,
NID_des3 = 67,
NID_sha256 = 672,

2
wolfssl/ssl.h
View File

@@ -1177,8 +1177,6 @@ enum {
BIO_CLOSE = 1,
BIO_NOCLOSE = 0,
NID_undef = 0,
X509_FILETYPE_PEM = 8,
X509_LU_X509 = 9,
X509_LU_CRL = 12,

1
wolfssl/wolfcrypt/asn.h
View File

@@ -137,6 +137,7 @@ enum DN_Tags {
#define WOLFSSL_BUS_CAT "/businessCategory="
#define WOLFSSL_JOI_C "/jurisdictionC="
#define WOLFSSL_JOI_ST "/jurisdictionST="
#define WOLFSSL_EMAIL_ADDR "/emailAddress="
enum ECC_TYPES {
ECC_PREFIX_0 = 160,