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

Merge pull request #6749 from cconlon/jniCertReq

Browse Source 
Add WOLFSSL_CERT_EXT to --enable-jni, minor CSR items
This commit is contained in:
JacobBarthelmeh
2023-09-01 16:15:10 -06:00
committed by GitHub
parent 0352b384a5 a2e2a3e994
commit 298b488bf1
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -5991,6 +5991,11 @@ then
ENABLED_CERTGEN="yes" ENABLED_CERTGEN="yes"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
fi fi
if test "x$ENABLED_CERTREQ" = "xno"
then
ENABLED_CERTREQ="yes"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_REQ"
fi
if test "x$ENABLED_SNI" = "xno" if test "x$ENABLED_SNI" = "xno"
then then
ENABLED_SNI="yes" ENABLED_SNI="yes"

15
src/x509.c
View File

@ -9691,7 +9691,8 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_chain_up_ref(
} }
if (req->keyUsageSet) if (req->keyUsageSet)
cert->keyUsage = req->keyUsage; cert->keyUsage = req->keyUsage;
/* Extended Key Usage not supported. */
cert->extKeyUsage = req->extKeyUsage;
#endif #endif
XMEMCPY(cert->challengePw, req->challengePw, CTC_NAME_SIZE); XMEMCPY(cert->challengePw, req->challengePw, CTC_NAME_SIZE);
@ -12611,6 +12612,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
str = "ST"; str = "ST";
len = 2; len = 2;
break; break;
case NID_streetAddress:
str = "street";
len = 6;
break;
case NID_organizationName: case NID_organizationName:
str = "O"; str = "O";
len = 1; len = 1;
@ -12619,6 +12624,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
str = "OU"; str = "OU";
len = 2; len = 2;
break; break;
case NID_postalCode:
str = "postalCode";
len = 10;
break;
case NID_emailAddress: case NID_emailAddress:
str = "emailAddress"; str = "emailAddress";
len = 12; len = 12;
@ -12651,6 +12660,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
str = "contentType"; str = "contentType";
len = 11; len = 11;
break; break;
case NID_userId:
str = "UID";
len = 3;
break;
default: default:
WOLFSSL_MSG("Attribute type not found"); WOLFSSL_MSG("Attribute type not found");
str = NULL; str = NULL;