- Certificate Requests written now have the Email address written in IA5String
diff --git a/library/x509write.c b/library/x509write.c
index b114e70..2b021d7 100644
--- a/library/x509write.c
+++ b/library/x509write.c
@@ -116,9 +116,15 @@
size_t oid_len = 0;
size_t len = 0;
- // Write PrintableString
+ // Write PrintableString for all except OID_PKCS9_EMAIL
//
- ASN1_CHK_ADD( string_len, asn1_write_printable_string( p, start, name ) );
+ if( OID_SIZE( OID_PKCS9_EMAIL ) == strlen( oid ) &&
+ memcmp( oid, OID_PKCS9_EMAIL, strlen( oid ) ) == 0 )
+ {
+ ASN1_CHK_ADD( string_len, asn1_write_ia5_string( p, start, name ) );
+ }
+ else
+ ASN1_CHK_ADD( string_len, asn1_write_printable_string( p, start, name ) );
// Write OID
//