Fix for CSR generation after PR (https://github.com/wolfSSL/wolfssl/pull/1734). This resolves issue with email name in CSR. (Thanks to Forum post https://www.wolfssl.com/forums/post4137.html).

Failed examples:

```
145:d=5  hl=2 l=  16 prim: EOC
      0000 - 69 6e 66 6f 40 77 6f 6c-66 73 73 6c 2e 63 6f 6d   info@wolfssl.com
```

```
SET {
138  23:         SEQUENCE {
140   3:           OBJECT IDENTIFIER objectClass (2 5 4 0)
       :             Error: Spurious EOC in definite-length item.
```

Success Examples:

```
140:d=5  hl=2 l=   9 prim: OBJECT            :emailAddress
  151:d=5  hl=2 l=  16 prim: IA5STRING         :info@wolfssl.com
```

```
SET {
138  29:         SEQUENCE {
140   9:           OBJECT IDENTIFIER emailAddress (1 2 840 113549 1 9 1)
151  16:           IA5String 'info@wolfssl.com'
```
This commit is contained in:
David Garske 2018-08-31 11:20:04 -07:00
parent 31e37ea5df
commit 6171e29fe8

View File

@ -9461,7 +9461,12 @@ static char GetNameType(CertName* name, int idx)
#ifdef WOLFSSL_CERT_EXT
case 7:
return name->busCatEnc;
case 8:
#else
case 7:
#endif
default:
return 0;
}
@ -9493,8 +9498,15 @@ static byte GetNameId(int idx)
case 6:
return ASN_COMMON_NAME;
#ifdef WOLFSSL_CERT_EXT
case 7:
return ASN_EMAIL_NAME;
return ASN_BUS_CAT;
case 8:
#else
case 7:
#endif
return ASN_EMAIL_NAME;
default:
return 0;