Support Windows based ECDSA SignedCms#91183

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

Merged
vcsjones merged 1 commit into from
Aug 28, 2023
Merged

Support Windows based ECDSA SignedCms #91183

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
8 changes: 4 additions & 4 deletions ...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
}

private sealed partial class ECDsaCmsSignature : CmsSignature
{
private readonly HashAlgorithmName _expectedDigest;
private readonly HashAlgorithmName? _expectedDigest;
private readonly string? _signatureAlgorithm;

internal override RSASignaturePadding? SignaturePadding => null;

internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
{
_signatureAlgorithm = signatureAlgorithm;
_expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
ReadOnlyMemory<byte>? signatureParameters,
X509Certificate2 certificate)
{
if (_expectedDigest != digestAlgorithmName)
if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
{
throw new CryptographicException(
SR.Format(
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
public const string RsaPss = "1.2.840.113549.1.1.10";
public const string Esdh = "1.2.840.113549.1.9.16.3.5";
public const string Dh = "1.2.840.10046.2.1";
public const string EcPublicKey = "1.2.840.10045.2.1";
public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

// Cryptographic Attribute Types
Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
}
}

[Fact]
public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
{
SignedCms cms = new SignedCms();
cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

cms.CheckSignature(true); // Assert.NoThrow
Assert.Single(cms.SignerInfos);

SignerInfo signerInfo = cms.SignerInfos[0];
Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
}

private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
{
using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down
33 changes: 33 additions & 0 deletions src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
"F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
"776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
"0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

// produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
// $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
// [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
// 'Test',
// 'EphemeralKeySet')
// $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
// $signer.IncludeOption = 'ExcludeRoot'
// $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
// $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
// $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
// $signedCms.ComputeSignature($signer, $true)
// $signedCms.Encode()
internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
"3082023106092A864886F70D010702A08202223082021E020101310F300D" +
"06096086480165030402010500301006092A864886F70D010701A0030401" +
"00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
"D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
"45434453412054657374301E170D3135303530313030333730335A170D31" +
"36303530313030353730335A30153113301106035504030C0A4543445341" +
"20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
"00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
"36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
"2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
"551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
"082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
"926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
"4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
"0101302930153113301106035504030C0A45434453412054657374021035" +
"428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
"300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
"77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
"1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Support Windows based ECDSA SignedCms#91183

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

 Merged

vcsjones
merged 1 commit into

from

Aug 28, 2023
 Merged


Support Windows based ECDSA SignedCms
#91183
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


8 changes: 4 additions & 4 deletions
...em.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.ECDsa.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,17 +22,17 @@ static partial void PrepareRegistrationECDsa(Dictionary<string, CmsSignature> lo
 lookup.Add(Oids.ECDsaWithSha3_384, new ECDsaCmsSignature(Oids.ECDsaWithSha3_384, HashAlgorithmName.SHA3_384));
 lookup.Add(Oids.ECDsaWithSha3_512, new ECDsaCmsSignature(Oids.ECDsaWithSha3_512, HashAlgorithmName.SHA3_512));
#endif
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, default));
 lookup.Add(Oids.EcPublicKey, new ECDsaCmsSignature(null, null));
 }

 private sealed partial class ECDsaCmsSignature : CmsSignature
 {
 private readonly HashAlgorithmName _expectedDigest;
 private readonly HashAlgorithmName? _expectedDigest;
 private readonly string? _signatureAlgorithm;

 internal override RSASignaturePadding? SignaturePadding => null;

 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName expectedDigest)
 internal ECDsaCmsSignature(string? signatureAlgorithm, HashAlgorithmName? expectedDigest)
 {
 _signatureAlgorithm = signatureAlgorithm;
 _expectedDigest = expectedDigest;
Expand All@@ -56,7 +56,7 @@ internal override bool VerifySignature(
 ReadOnlyMemory<byte>? signatureParameters,
 X509Certificate2 certificate)
 {
 if (_expectedDigest != digestAlgorithmName)
 if (_expectedDigest != null && _expectedDigest != digestAlgorithmName)
 {
 throw new CryptographicException(
 SR.Format(
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ internal static class Oids
 public const string RsaPss = "1.2.840.113549.1.1.10";
 public const string Esdh = "1.2.840.113549.1.9.16.3.5";
 public const string Dh = "1.2.840.10046.2.1";
 public const string EcPublicKey = "1.2.840.10045.2.1";
 public const string EcdsaSha256 = "1.2.840.10045.4.3.2";

 // Cryptographic Attribute Types
Expand Down

14 changes: 14 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.netcoreapp.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -823,6 +823,20 @@ public static void ExistingDocument_Rsa_Sha3_512()
 }
 }

 [Fact]
 public static void ExistingDocument_Ecdsa_Sha256_FromNetFX()
 {
 SignedCms cms = new SignedCms();
 cms.Decode(SignedDocuments.Ecdsa_Sha256_FromNetFX_SignedDocument);

 cms.CheckSignature(true); // Assert.NoThrow
 Assert.Single(cms.SignerInfos);

 SignerInfo signerInfo = cms.SignerInfos[0];
 Assert.Equal(Oids.Sha256, signerInfo.DigestAlgorithm.Value);
 Assert.Equal(Oids.EcPublicKey, signerInfo.SignatureAlgorithm.Value);
 }

 private static void VerifyWithExplicitPrivateKey(X509Certificate2 cert, AsymmetricAlgorithm key)
 {
 using (var pubCert = new X509Certificate2(cert.RawData))
Expand Down

33 changes: 33 additions & 0 deletions
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1789,5 +1789,38 @@ internal static class SignedDocuments
 "F11C632B4F605A41821A3F15B4F537FD5F0EE3426A7A03732AC946C3B435" +
 "776A873A3DAE93FB8312C681144CF51F05CE37A0DB4C1544E178F88E421C" +
 "0B5456D18C13B335DA808CE60C4E35F507").HexToByteArray();

 // produced with the below PowerShell code using the pfx Certificates.ECDsaP256Win
 // $cert = [System.Security.Cryptography.X509Certificates.X509Certificate2]::new(
 // [System.Convert]::FromBase64String($Certificates_ECDsaP256Win),
 // 'Test',
 // 'EphemeralKeySet')
 // $signer = [System.Security.Cryptography.Pkcs.CmsSigner]::new('IssuerAndSerialNumber', $cert)
 // $signer.IncludeOption = 'ExcludeRoot'
 // $signer.DigestAlgorithm = '2.16.840.1.101.3.4.2.1'
 // $contentInfo = [System.Security.Cryptography.Pkcs.ContentInfo]::new([byte[]]@(0))
 // $signedCms = [System.Security.Cryptography.Pkcs.SignedCms]::new($contentInfo, $false)
 // $signedCms.ComputeSignature($signer, $true)
 // $signedCms.Encode()
 internal static readonly byte[] Ecdsa_Sha256_FromNetFX_SignedDocument = (
 "3082023106092A864886F70D010702A08202223082021E020101310F300D" +
 "06096086480165030402010500301006092A864886F70D010701A0030401" +
 "00A082015C308201583081FFA003020102021035428F3B3C5107AD49E776" +
 "D6E74C4DC8300A06082A8648CE3D04030230153113301106035504030C0A" +
 "45434453412054657374301E170D3135303530313030333730335A170D31" +
 "36303530313030353730335A30153113301106035504030C0A4543445341" +
 "20546573743059301306072A8648CE3D020106082A8648CE3D0301070342" +
 "00047590F69CA114E92927E034C997B7C882A8C992AC00CEFB4EB8319015" +
 "36F291E1B515263BCD20E1EA32496FDAC84E2D8D1B703266A9088F6EAF65" +
 "2549D9BB63D5A331302F300E0603551D0F0101FF040403020388301D0603" +
 "551D0E0416041411218A92C5EB12273B3C5CCFB8220CCCFDF387DB300A06" +
 "082A8648CE3D040302034800304502201AFE595E19F1AE4B6A4B231E8851" +
 "926438C55B5DDE632E6ADF13C1023A65898E022100CBDF434FDD197D8B59" +
 "4E8026E44263BADE773C2BEBD060CC4109484A498E7C7E31819530819202" +
 "0101302930153113301106035504030C0A45434453412054657374021035" +
 "428F3B3C5107AD49E776D6E74C4DC8300D06096086480165030402010500" +
 "300B06072A8648CE3D020105000446304402203557687B26E650E4F86F4B" +
 "77A5BF5851350C96F01142696CC1391632CB95C3370220017FD4D9329F00" +
 "1EC74210CD34CAEE3878B2302602DB7930347E104679734291").HexToByteArray();
 }
}