forked from dotnet/corefx
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unix cms encryption, csp version update.
- Loading branch information
Showing
7 changed files
with
127 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
61 changes: 61 additions & 0 deletions
61
...m.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.Unix.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| using System; | ||
| using System.Security.Cryptography; | ||
| using System.Security.Cryptography.Pkcs; | ||
| using System.Security.Cryptography.Xml; | ||
| using static Interop.Crypt32; | ||
|
|
||
| namespace Internal.Cryptography.Pal.Windows | ||
| { | ||
| internal static partial class HelpersWindows | ||
| { | ||
| const int sizeof_wchar_t = 4; | ||
|
|
||
| public static SubjectIdentifier ToSubjectIdentifier(this CERT_ID certId) | ||
| { | ||
| switch (certId.dwIdChoice) | ||
| { | ||
| case CertIdChoice.CERT_ID_ISSUER_SERIAL_NUMBER: | ||
| { | ||
| const int dwStrType = (int)(CertNameStrTypeAndFlags.CERT_X500_NAME_STR | CertNameStrTypeAndFlags.CERT_NAME_STR_REVERSE_FLAG); | ||
|
|
||
| string issuer; | ||
| unsafe | ||
| { | ||
| DATA_BLOB* dataBlobPtr = &certId.u.IssuerSerialNumber.Issuer; | ||
|
|
||
| int nc = Interop.Crypt32.CertNameToStr((int)MsgEncodingType.All, dataBlobPtr, dwStrType, null, 0); | ||
| if (nc <= 1) // The API actually return 1 when it fails; which is not what the documentation says. | ||
| { | ||
| throw Interop.CPError.GetLastWin32Error().ToCryptographicException(); | ||
| } | ||
|
|
||
| Span<byte> name = nc <= 256 ? stackalloc byte[nc*sizeof_wchar_t] : new byte[nc*sizeof_wchar_t]; | ||
| fixed (byte* namePtr = name) | ||
| { | ||
| nc = Interop.Crypt32.CertNameToStr((int)MsgEncodingType.All, dataBlobPtr, dwStrType, (char*)namePtr, nc); | ||
| if (nc <= 1) // The API actually return 1 when it fails; which is not what the documentation says. | ||
| { | ||
| throw Interop.CPError.GetLastWin32Error().ToCryptographicException(); | ||
| } | ||
|
|
||
| issuer = System.Text.Encoding.UTF32.GetString(name.Slice(0, (nc-1)*sizeof_wchar_t).ToArray()); | ||
| } | ||
| } | ||
|
|
||
| byte[] serial = certId.u.IssuerSerialNumber.SerialNumber.ToByteArray(); | ||
| X509IssuerSerial issuerSerial = new X509IssuerSerial(issuer, serial.ToSerialString()); | ||
| return new SubjectIdentifier(SubjectIdentifierType.IssuerAndSerialNumber, issuerSerial); | ||
| } | ||
|
|
||
| case CertIdChoice.CERT_ID_KEY_IDENTIFIER: | ||
| { | ||
| byte[] ski = certId.u.KeyId.ToByteArray(); | ||
| return new SubjectIdentifier(SubjectIdentifierType.SubjectKeyIdentifier, ski.ToSkiString()); | ||
| } | ||
|
|
||
| default: | ||
| throw new CryptographicException(SR.Format(SR.Cryptography_Cms_Invalid_Subject_Identifier_Type, certId.dwIdChoice)); | ||
| } | ||
| } | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
...ecurity.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/HelpersWindows.Windows.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| using System; | ||
| using System.Security.Cryptography; | ||
| using System.Security.Cryptography.Pkcs; | ||
| using System.Security.Cryptography.Xml; | ||
| using static Interop.Crypt32; | ||
|
|
||
| namespace Internal.Cryptography.Pal.Windows | ||
| { | ||
| internal static partial class HelpersWindows | ||
| { | ||
| public static SubjectIdentifier ToSubjectIdentifier(this CERT_ID certId) | ||
| { | ||
| switch (certId.dwIdChoice) | ||
| { | ||
| case CertIdChoice.CERT_ID_ISSUER_SERIAL_NUMBER: | ||
| { | ||
| const int dwStrType = (int)(CertNameStrTypeAndFlags.CERT_X500_NAME_STR | CertNameStrTypeAndFlags.CERT_NAME_STR_REVERSE_FLAG); | ||
|
|
||
| string issuer; | ||
| unsafe | ||
| { | ||
| DATA_BLOB* dataBlobPtr = &certId.u.IssuerSerialNumber.Issuer; | ||
|
|
||
| int nc = Interop.Crypt32.CertNameToStr((int)MsgEncodingType.All, dataBlobPtr, dwStrType, null, 0); | ||
| if (nc <= 1) // The API actually return 1 when it fails; which is not what the documentation says. | ||
| { | ||
| throw Interop.CPError.GetLastWin32Error().ToCryptographicException(); | ||
| } | ||
|
|
||
| Span<char> name = nc <= 128 ? stackalloc char[128] : new char[nc]; | ||
| fixed (char* namePtr = name) | ||
| { | ||
| nc = Interop.Crypt32.CertNameToStr((int)MsgEncodingType.All, dataBlobPtr, dwStrType, namePtr, nc); | ||
| if (nc <= 1) // The API actually return 1 when it fails; which is not what the documentation says. | ||
| { | ||
| throw Interop.CPError.GetLastWin32Error().ToCryptographicException(); | ||
| } | ||
|
|
||
| issuer = new string(namePtr); | ||
| } | ||
| } | ||
|
|
||
| byte[] serial = certId.u.IssuerSerialNumber.SerialNumber.ToByteArray(); | ||
| X509IssuerSerial issuerSerial = new X509IssuerSerial(issuer, serial.ToSerialString()); | ||
| return new SubjectIdentifier(SubjectIdentifierType.IssuerAndSerialNumber, issuerSerial); | ||
| } | ||
|
|
||
| case CertIdChoice.CERT_ID_KEY_IDENTIFIER: | ||
| { | ||
| byte[] ski = certId.u.KeyId.ToByteArray(); | ||
| return new SubjectIdentifier(SubjectIdentifierType.SubjectKeyIdentifier, ski.ToSkiString()); | ||
| } | ||
|
|
||
| default: | ||
| throw new CryptographicException(SR.Format(SR.Cryptography_Cms_Invalid_Subject_Identifier_Type, certId.dwIdChoice)); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters