Merge pull request #6749 from cconlon/jniCertReq
Add WOLFSSL_CERT_EXT to --enable-jni, minor CSR items
This commit is contained in:
commit
298b488bf1
@ -5991,6 +5991,11 @@ then
|
||||
ENABLED_CERTGEN="yes"
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
|
||||
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"
|
||||
then
|
||||
ENABLED_SNI="yes"
|
||||
|
15
src/x509.c
15
src/x509.c
@ -9691,7 +9691,8 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_chain_up_ref(
|
||||
}
|
||||
if (req->keyUsageSet)
|
||||
cert->keyUsage = req->keyUsage;
|
||||
/* Extended Key Usage not supported. */
|
||||
|
||||
cert->extKeyUsage = req->extKeyUsage;
|
||||
#endif
|
||||
|
||||
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";
|
||||
len = 2;
|
||||
break;
|
||||
case NID_streetAddress:
|
||||
str = "street";
|
||||
len = 6;
|
||||
break;
|
||||
case NID_organizationName:
|
||||
str = "O";
|
||||
len = 1;
|
||||
@ -12619,6 +12624,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
|
||||
str = "OU";
|
||||
len = 2;
|
||||
break;
|
||||
case NID_postalCode:
|
||||
str = "postalCode";
|
||||
len = 10;
|
||||
break;
|
||||
case NID_emailAddress:
|
||||
str = "emailAddress";
|
||||
len = 12;
|
||||
@ -12651,6 +12660,10 @@ static int get_dn_attr_by_nid(int n, const char** buf)
|
||||
str = "contentType";
|
||||
len = 11;
|
||||
break;
|
||||
case NID_userId:
|
||||
str = "UID";
|
||||
len = 3;
|
||||
break;
|
||||
default:
|
||||
WOLFSSL_MSG("Attribute type not found");
|
||||
str = NULL;
|
||||
|
Loading…
x
Reference in New Issue
Block a user