From b020d5da793b68519e2800a0542454c46e9254a9 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 3 Jun 2024 10:57:22 +0100 Subject: [PATCH 1/2] Correctly format email addresses. --- x509-cert/src/attr.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x509-cert/src/attr.rs b/x509-cert/src/attr.rs index d4cccc30e..fc6288db3 100644 --- a/x509-cert/src/attr.rs +++ b/x509-cert/src/attr.rs @@ -2,6 +2,7 @@ use alloc::vec::Vec; use const_oid::db::{ + rfc3280::{EMAIL, EMAIL_ADDRESS}, rfc4519::{COUNTRY_NAME, DOMAIN_COMPONENT, SERIAL_NUMBER}, Database, DB, }; @@ -191,6 +192,9 @@ impl AttributeTypeAndValue { // Serial numbers are formatted as Printable String as per RFC 5280 Appendix A.1: // https://datatracker.ietf.org/doc/html/rfc5280#appendix-A.1 SERIAL_NUMBER => Tag::PrintableString, + // Email addresses are formatted as Ia5String as per RFC 5280 Appendix A.1: + // https://datatracker.ietf.org/doc/html/rfc5280#appendix-A.1 + EMAIL | EMAIL_ADDRESS => Tag::Ia5String, _ => Tag::Utf8String, }; From c0077ab2905f22a9acb5577c5a9d0d7ffdb50025 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 3 Jun 2024 11:03:31 +0100 Subject: [PATCH 2/2] Remove unnecessary OID synonym --- x509-cert/src/attr.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x509-cert/src/attr.rs b/x509-cert/src/attr.rs index fc6288db3..f19fea6a6 100644 --- a/x509-cert/src/attr.rs +++ b/x509-cert/src/attr.rs @@ -2,7 +2,7 @@ use alloc::vec::Vec; use const_oid::db::{ - rfc3280::{EMAIL, EMAIL_ADDRESS}, + rfc3280::EMAIL_ADDRESS, rfc4519::{COUNTRY_NAME, DOMAIN_COMPONENT, SERIAL_NUMBER}, Database, DB, }; @@ -194,7 +194,7 @@ impl AttributeTypeAndValue { SERIAL_NUMBER => Tag::PrintableString, // Email addresses are formatted as Ia5String as per RFC 5280 Appendix A.1: // https://datatracker.ietf.org/doc/html/rfc5280#appendix-A.1 - EMAIL | EMAIL_ADDRESS => Tag::Ia5String, + EMAIL_ADDRESS => Tag::Ia5String, _ => Tag::Utf8String, };