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.

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

Implement ExportPkcs12 #112569

Merged
merged 19 commits into from
Feb 20, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'ms/main' into export12-pbe-parameters
  • Loading branch information
vcsjones committed Feb 14, 2025
commit 4b172e8edd0db6ac8bc9f21a0833a8cf53fb7923
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,12 @@
<Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\SignerIdentifierAsn.xml.cs">
<DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\SignerIdentifierAsn.xml</DependentUpon>
</Compile>
<Compile Include="$(CommonPath)System\Security\Cryptography\AesGcm.cs"
Link="Common\System\Security\Cryptography\AesGcm.cs" />
<Compile Include="$(CommonPath)System\Security\Cryptography\AesAEAD.cs"
Link="Common\System\Security\Cryptography\AesAEAD.cs" />
<Compile Include="$(CommonPath)System\Security\Cryptography\AuthenticationTagMismatchException.cs"
Link="Common\System\Security\Cryptography\AuthenticationTagMismatchException.cs" />
<Compile Include="$(CommonPath)System\Security\Cryptography\CryptographicAttributeObject.cs"
Link="Common\System\Security\Cryptography\CryptographicAttributeObject.cs" />
<Compile Include="$(CommonPath)System\Security\Cryptography\CryptographicAttributeObjectCollection.cs"
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.