From ceeeb2cfc746bdece658a2f4922e2dc3ef7f35e1 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 1 Jul 2022 16:41:24 +0200 Subject: [PATCH 1/4] Add Android configuration file and public keys --- .../res/raw/ndx_test_root_ca.pem | 19 ++++++++++++ .../testselfsignedservereku_contoso_com.pem | 30 +++++++++++++++++++ .../res/xml/network_security_config.xml | 9 ++++++ 3 files changed, 58 insertions(+) create mode 100644 src/System.Net.TestData/res/raw/ndx_test_root_ca.pem create mode 100644 src/System.Net.TestData/res/raw/testselfsignedservereku_contoso_com.pem create mode 100644 src/System.Net.TestData/res/xml/network_security_config.xml diff --git a/src/System.Net.TestData/res/raw/ndx_test_root_ca.pem b/src/System.Net.TestData/res/raw/ndx_test_root_ca.pem new file mode 100644 index 000000000..f3b1b7732 --- /dev/null +++ b/src/System.Net.TestData/res/raw/ndx_test_root_ca.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDEzCCAfugAwIBAgIQMmqZISHkNa9CRIejcKfJ0zANBgkqhkiG9w0BAQsFADAb +MRkwFwYDVQQDExBORFggVGVzdCBSb290IENBMCAXDTE1MDEyMDE2Mzk0MFoYDzIx +MTUwMTIwMTY0OTQwWjAbMRkwFwYDVQQDExBORFggVGVzdCBSb290IENBMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsoCIqyKisENYWpW/ETxatwOs0tQm +v1J/DdvYJf5jqtAbgwkqRTkAdBoz+Qm8qp1iG7JOs/Kbm+Pg3dX2t3WAm6INViwb +tbO9tZXg1l/JIobzm6ydaBnlOEbV2MT4iZOYd8dAmmSFiFzUNejqZQlQEhBbCNdN +NKQkhXY3Hih6mRSIoojU+cnzufA+ljGgfZZD4IfA0nXfYhY3HeYeJd62z+4dXFZY +uaKoTnGeYVwwn5kBKs4Nu6hPUZDczXl6dJLuZpBHxB/5IxhRpiK4NFcJL+A62mco +5Cs7tnIiIPrtvV+15Sht3KNh701nuSi+iCaw+BTPMhvz+q13QWY2EkUvEQIDAQAB +o1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUuaSM +Cyt8HbmNrqLzId+bVu0zSbQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEL +BQADggEBAKC2zVHBZvG4JVEu/F3dIFthzR+WyCxbvfUABewlAkrQfko/JLiOJtR5 +l9gxKeSjGrrdzgumsrs1oNdDPWxwuQbvfwQr3MLSIpfrfYMJsXnDQbh3yjuhfQeG +eyrGPijJNlmyo8lBKbaNvR1MHG8/1O1+Rh2Omi8IN/IQaB8K+LrMOx/bkhyVn3N5 +RFBqrOs1HzJQ+/skvn4QxlrD/0yFwoSy6FuM+dMUDDPP6MUztD0tFNq5rPwUeaWK +XUJyKqfAtMMA6dRdeiyvm20Wj8t8cfFDMIyGynyyEkG3pVhtwh4WTdxXxc9CKyzD +7Sp7I7L/ckSl2KVdDH8BZqCp2GO1Ct0= +-----END CERTIFICATE----- diff --git a/src/System.Net.TestData/res/raw/testselfsignedservereku_contoso_com.pem b/src/System.Net.TestData/res/raw/testselfsignedservereku_contoso_com.pem new file mode 100644 index 000000000..ace567381 --- /dev/null +++ b/src/System.Net.TestData/res/raw/testselfsignedservereku_contoso_com.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFLDCCAxSgAwIBAgIQfmtqh0j0E4xKOEtQct2gDDANBgkqhkiG9w0BAQsFADAu +MSwwKgYDVQQDDCN0ZXN0c2VsZnNpZ25lZHNlcnZlcmVrdS5jb250b3NvLmNvbTAe +Fw0xNzAxMTcxNzM3NTdaFw0zNTAxMTgwMDAwMDBaMC4xLDAqBgNVBAMMI3Rlc3Rz +ZWxmc2lnbmVkc2VydmVyZWt1LmNvbnRvc28uY29tMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA0GTseYG1nulEdl5glEttoncY7S+CKRXWTJFvgFqHlPOk +i7C8qbJz4qE/OPhjEKE5u3poVi372P5dXFhzD41TFRMtk3BA9G7IaPQx9mGClY/3 +X9fLbFJWxmsTn1dQNvpvQ4EZ6I3hUiMeJ8xADLqGYFm0Vn8izLZGAe6sa4x+xSMp +ubcz8135Bs0dnGBAU6vkJ1zfJ8IYsrXR7+r0yY4iMi7BobUVYrP/pdTm8SHroQGl +FpjMVGk/OfAkYA8g47/jLnl4ed4FjwXp22QEEAK2Nl1nXfddM9W0mcKEao5gIgLp +LBWcPoMYhKMS3wpFm64FRoL94HZE6V/uBKWIeZw9KvAl8dqTnGqy9ScnoaIgihLa +/pyeVSdLxIClgUsbuAy3/aVqKxf+diCajNii/iTHhhxe8Q/Dys9XZjV9Ahb18Jzy +QydiaBfsJOStoxfiw576YLXmYs1ZhGqEavOU6eIRiGJWUoV5HaEw3xxM2gZe+dUj +sJob10m3NbS30jpcLpcRDYUTp9i4Ds4d54RTunyDmmFDJ2WpK87m5yCkgi3htwRX +UwlBwP/vtj8QNXoJNAvUXbiCyvV2HMLjXVcQS9yikIvyJHqrX+j0HoZusNCN2BHU +h2XClkdjKuUL5cStoCWbGxQXPXxqU5ar0+rdr4cy2n5yM/sgWab8dOFFqkISX1EC +AwEAAaNGMEQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDgYDVR0PAQH/BAQDAgWgMB0G +A1UdDgQWBBRMQJRiV8BycdZmKrBLb7yIFpCgjDANBgkqhkiG9w0BAQsFAAOCAgEA +YWsjqQkQocix7Ij0J6T9cCho1cKzSWR1dh4uuMJvThTr+As2lv5NdilGa19Ita5e +fkooIZ3cke7TNX7na5iQS/vfhh3RhnC02mvxCUdXVMwrB1nUXA8DA80d0N2KhWeg +KcsfhtYlTGUehF7nTRQNqsh5DPI1X0oW2wSjB/dXfQmbS8TyspdSoq3hc7ahBYiz +/S+IFPxpwMLi9RFYRJa0nhDEnCgoUt8sVTrbLUfQvkpbXvzelscL3yJMEP2qlRXt +n2d8khOg7ZXDUUelYm8HgLlP2UbAKs5XIIADtdgprpbav/ZMeBcqmx/YcxBE2oO2 +X9YFAvEj65NPzu+vlWkFgTL+fGk34+PFEjV/Ts0EPfdZIAD7T7Wu7efMbLvLyKZs +O8y8Wo/95jb5grpym0pjfdR5b1/o5TfTsDjE88GfgqHjvxv31VihZ1Zh5dqdErE2 +Hi8hboIDVuYRKIBc4+gf5loWWuNIL5tB3coUvGMdO1o0W+DmtkZu2CEjGrfEtjNy +RxFWKjZ4HGf8iMgBlzyb+N8k7rprEOpQ/3qzRdMciQRi2Ee49gu50YjTzqMIZR9V +ZLElXpj4kJePbJzFxrLuDy8jIOoHstyft39tH7IY6ucjH4DUQzAZO/TJKDuEHxHt +Z6W8nh15R7EEpUp6Q3vQyBMqZf2j3732r8LjKbj3jPw= +-----END CERTIFICATE----- diff --git a/src/System.Net.TestData/res/xml/network_security_config.xml b/src/System.Net.TestData/res/xml/network_security_config.xml new file mode 100644 index 000000000..42d8f97ea --- /dev/null +++ b/src/System.Net.TestData/res/xml/network_security_config.xml @@ -0,0 +1,9 @@ + + + + + + + + + From fff42a07dd9723f6f87e66a163056a93318e9295 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 1 Jul 2022 16:41:35 +0200 Subject: [PATCH 2/4] Update readme --- src/System.Net.TestData/readme.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/System.Net.TestData/readme.md b/src/System.Net.TestData/readme.md index e03aab3da..471f63dab 100644 --- a/src/System.Net.TestData/readme.md +++ b/src/System.Net.TestData/readme.md @@ -2,6 +2,9 @@ This package contains test certificates for `System.Net` library. -The TestData directory is considered obsolete. The certificates are encrypted with RC2 and triple des encryption. The pfx password is `testcertificate`. +The `TestData` directory is considered obsolete. The certificates are encrypted with RC2 and triple des encryption. The pfx password is `testcertificate`. + +The `TestDataCertificates` directory contains the same pfx certificates as in `TestData` however they are all encrypted by triple des encryption. The pfx password is `PLACEHOLDER`. + +The `res` directory is necessary for running tests on Android. It contains the `network_security_config.xml` file and public keys in the PEM format exported from the data in the TestDataCertificates directory (see [Network security configuration on Android](https://developer.android.com/training/articles/security-config)). -The TestDataCertificates directory contains the same pfx certificates as in TestData however they are all encrypted by triple des encryption. The pfx password is `PLACEHOLDER`. \ No newline at end of file From 157eb8de401da49767b10cb0f6217606a4064a42 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 1 Jul 2022 17:13:19 +0200 Subject: [PATCH 3/4] Fix missing system certificates --- src/System.Net.TestData/res/xml/network_security_config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.Net.TestData/res/xml/network_security_config.xml b/src/System.Net.TestData/res/xml/network_security_config.xml index 42d8f97ea..71490ea97 100644 --- a/src/System.Net.TestData/res/xml/network_security_config.xml +++ b/src/System.Net.TestData/res/xml/network_security_config.xml @@ -4,6 +4,7 @@ + From 6a73b5b85b205aaa480a79d69990c73ac9085196 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 1 Jul 2022 17:14:07 +0200 Subject: [PATCH 4/4] Update readme --- src/System.Net.TestData/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Net.TestData/readme.md b/src/System.Net.TestData/readme.md index 471f63dab..cbb1e8eed 100644 --- a/src/System.Net.TestData/readme.md +++ b/src/System.Net.TestData/readme.md @@ -6,5 +6,5 @@ The `TestData` directory is considered obsolete. The certificates are encrypted The `TestDataCertificates` directory contains the same pfx certificates as in `TestData` however they are all encrypted by triple des encryption. The pfx password is `PLACEHOLDER`. -The `res` directory is necessary for running tests on Android. It contains the `network_security_config.xml` file and public keys in the PEM format exported from the data in the TestDataCertificates directory (see [Network security configuration on Android](https://developer.android.com/training/articles/security-config)). +The `res` directory is necessary for running tests on Android. It contains the `network_security_config.xml` file and public keys in the PEM format exported from the pfx certificates in the `TestDataCertificates` directory (see [Network security configuration on Android](https://developer.android.com/training/articles/security-config)).