feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

allow CSR challenge pass to be encoded as PrintableString

Browse Source
This commit is contained in:
Chris Conlon
2019-07-12 16:23:48 -07:00
parent b4765a5c9e
commit 9d9495f8b6
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfcrypt/src/asn.c
View File

@@ -10065,6 +10065,12 @@ typedef struct DerCert {
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
/* Write a set header to output */ /* Write a set header to output */
static word32 SetPrintableString(word32 len, byte* output)
{
output[0] = ASN_PRINTABLE_STRING;
return SetLength(len, output + 1) + 1;
}
static word32 SetUTF8String(word32 len, byte* output) static word32 SetUTF8String(word32 len, byte* output)
{ {
output[0] = ASN_UTF8STRING; output[0] = ASN_UTF8STRING;
@@ -11961,7 +11967,8 @@ int wc_MakeNtruCert(Cert* cert, byte* derBuffer, word32 derSz,
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
static int SetReqAttrib(byte* output, char* pw, int extSz) static int SetReqAttrib(byte* output, char* pw, int pwPrintableString,
int extSz)
{ {
static const byte cpOid[] = static const byte cpOid[] =
{ ASN_OBJECT_ID, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, { ASN_OBJECT_ID, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
@@ -11990,7 +11997,11 @@ static int SetReqAttrib(byte* output, char* pw, int extSz)
if (pw && pw[0]) { if (pw && pw[0]) {
pwSz = (int)XSTRLEN(pw); pwSz = (int)XSTRLEN(pw);
if (pwPrintableString) {
cpStrSz = SetPrintableString(pwSz, cpStr);
} else {
cpStrSz = SetUTF8String(pwSz, cpStr); cpStrSz = SetUTF8String(pwSz, cpStr);
}
cpSetSz = SetSet(cpStrSz + pwSz, cpSet); cpSetSz = SetSet(cpStrSz + pwSz, cpSet);
cpSeqSz = SetSequence(sizeof(cpOid) + cpSetSz + cpStrSz + pwSz, cpSeq); cpSeqSz = SetSequence(sizeof(cpOid) + cpSetSz + cpStrSz + pwSz, cpSeq);
cpSz = cpSeqSz + sizeof(cpOid) + cpSetSz + cpStrSz + pwSz; cpSz = cpSeqSz + sizeof(cpOid) + cpSetSz + cpStrSz + pwSz;
@@ -12198,8 +12209,9 @@ static int EncodeCertReq(Cert* cert, DerCert* der, RsaKey* rsaKey,
#endif /* WOLFSSL_CERT_EXT */ #endif /* WOLFSSL_CERT_EXT */
} }
der->attribSz = SetReqAttrib(der->attrib, der->attribSz = SetReqAttrib(der->attrib, cert->challengePw,
cert->challengePw, der->extensionsSz); cert->challengePwPrintableString,
der->extensionsSz);
if (der->attribSz <= 0) if (der->attribSz <= 0)
return REQ_ATTRIBUTE_E; return REQ_ATTRIBUTE_E;

1
wolfssl/wolfcrypt/asn_public.h
View File

@@ -296,6 +296,7 @@ typedef struct Cert {
#endif #endif
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
char challengePw[CTC_NAME_SIZE]; char challengePw[CTC_NAME_SIZE];
int challengePwPrintableString; /* encode as PrintableString */
#endif #endif
void* decodedCert; /* internal DecodedCert allocated from heap */ void* decodedCert; /* internal DecodedCert allocated from heap */
byte* der; /* Pointer to buffer of current DecodedCert cache */ byte* der; /* Pointer to buffer of current DecodedCert cache */