Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require UTF8 encoding in GetX509NameInfo #59116

Merged
merged 1 commit into from
Sep 15, 2021
Merged

Require UTF8 encoding in GetX509NameInfo #59116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
if (answer)
{
BIO* b = BIO_new(BIO_s_mem());
ASN1_STRING_print_ex(b, answer, 0);
ASN1_STRING_print_ex(b, answer, ASN1_STRFLGS_UTF8_CONVERT);
return b;
}
}
Expand Down Expand Up @@ -646,7 +646,7 @@ BIO* CryptoNative_GetX509NameInfo(X509* x509, int32_t nameType, int32_t forIssue
if (str)
{
BIO* b = BIO_new(BIO_s_mem());
ASN1_STRING_print_ex(b, str, 0);
ASN1_STRING_print_ex(b, str, ASN1_STRFLGS_UTF8_CONVERT);
sk_GENERAL_NAME_free(altNames);
return b;
}
Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/PropsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,20 @@ public static void TestGetNameInfo()
}
}

[Theory]
[InlineData(true)]
[InlineData(false)]
public static void GetNameInfo_HandlesUtf8Encoding(bool issuer)
{
using (X509Certificate2 c = new X509Certificate2(TestData.CertificateWithUtf8))
{
// Russian word for "potato" in Cyrillic, kartoshka.
string expected = "\u043A\u0430\u0440\u0442\u043E\u0448\u043A\u0430";
string cn = c.GetNameInfo(X509NameType.SimpleName, issuer);
Assert.Equal(expected, cn);
}
}

[Fact]
public static void ComplexGetNameInfo_SimpleName_Cert()
{
Expand Down
27 changes: 27 additions & 0 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,6 +2463,33 @@ internal struct ECDsaCngKeyValues
"028bedeefab9a2be80466fe278fdc50db1b9530e1796b23271b4df2cddd9" +
"4769c8a21a8f66c6d4bc181713").HexToByteArray();

internal static byte[] CertificateWithUtf8 = (
"30820315308201fda003020102020900e48b784d93645921300d06092a864886" +
"f70d01010b0500301b3119301706035504030c10d0bad0b0d180d182d0bed188" +
"d0bad0b0301e170d3231303931343230353635365a170d333230383237323035" +
"3635365a301b3119301706035504030c10d0bad0b0d180d182d0bed188d0bad0" +
"b030820122300d06092a864886f70d01010105000382010f003082010a028201" +
"0100c394711b3839a612aaadafde855ccc3479bc1dbe253a29e508cc46464efb" +
"ab09b16b85fb67e4be0ab8b09fa6ff73cb3ec5d8f8b7d2869a79c414d025a43e" +
"4c158c9711638dbfb070ef92b3633037d5e633a870ed024ab9017c97e26f02de" +
"2273dd92c0837a95ff12229981cd661b140afd841671d3397fd44aea05878dd0" +
"9362bd2de8da17225dd3caf0181aadf2c9e13faefbbce3ce80ef355dcc15c1b9" +
"c6e86bb1cddf32b3113e7a72ad3799cc67f64ea34c0518c22727972802084801" +
"e6565b2323e87fd20019a9db151e87b2b1db004583e15dd64c5393439a0ba5ed" +
"3b9fd262c8d8bf0263dcba092ca5591d4d34f990daa9ee41811cec6229f2121b" +
"582f0203010001a35c305a301b0603551d11041430128210786e2d2d38306161" +
"326162746c6f3363301d0603551d250416301406082b0601050507030106082b" +
"06010505070302300f0603551d130101ff040530030101ff300b0603551d0f04" +
"040302028c300d06092a864886f70d01010b050003820101001c0512d3d99267" +
"4ca3a1fdf942052064ffbda824aaeff07d9869eefa86e592102afca0dba4e267" +
"e54753552fc23da97b18f739ea437794aac5bb2ae7413ae54ce921b4b96fe420" +
"f3fd86f922adcab202589823c4095fc6e7904e61be1716faec7e09ce2d1bf431" +
"fa9fc2d7284689d2c940f7d027e16b9c3305f9cd6d5dc6bfee9089d85d342f5b" +
"d07920c51899288674a1732708a7e3a39fb11c152417d50a3bb9b09975852baa" +
"39767c289baea9330902ea38388932964c410cd22049415712223fb5710a21ef" +
"153ac22391a1603547ffb3f9b328c59e59b5d64568b9c451df233fe9a581116f" +
"05be8c67b92bc7df9984f30535ad53817cb4abcd77cb521856").HexToByteArray();

internal static byte[] ConcatenatedPemFile = ByteUtils.AsciiBytes(
@"-----BEGIN CERTIFICATE-----
MIIFcDCCBFigAwIBAgIQB6krbZc11OZ5l2/FnU3CpTANBgkqhkiG9w0BAQsFADBG
Expand Down