Skip to content

Fold inbox crypto into one assembly #64307

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
danmoseley merged 16 commits into from
Jan 30, 2022
Merged

Fold inbox crypto into one assembly #64307

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3450467
Fold S.S.C.Csp into System.Security.Cryptography
bartonjs Jan 14, 2022
e6f9000
Change CryptoConfig string lookups to typeof for CSP types
bartonjs Jan 14, 2022
3cec1f0
Fold S.S.C.Cng into S.S.Cryptography
bartonjs Jan 21, 2022
e4159db
Fold S.S.C.OpenSsl into S.S.Cryptography
bartonjs Jan 21, 2022
60d1223
Fold S.S.C.X509Certificates into S.S.Cryptography
bartonjs Jan 25, 2022
c843282
Fix dependent projects
bartonjs Jan 25, 2022
6385dd2
Fix ApiCompat errors
bartonjs Jan 26, 2022
ee7c362
Self-feedback
bartonjs Jan 26, 2022
a4c3f5b
Use typeof where now possible in CryptoConfig
bartonjs Jan 26, 2022
e99574d
Don't use CNG's PKCS8 export for default EC objects
bartonjs Jan 26, 2022
8465a78
RSA should probably function on Unix
bartonjs Jan 27, 2022
e160422
Fix nullability state of ChainPal.BuildChain across OSes
bartonjs Jan 27, 2022
ae0c119
Remove bad assert
bartonjs Jan 27, 2022
bb36d3a
Special case macOS ECC data keys in CopyWithPrivateKey
bartonjs Jan 28, 2022
ad5142e
Undo some of the string resurrections
bartonjs Jan 28, 2022
449598f
Add missing Obsolete attribute
bartonjs Jan 29, 2022
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
Use typeof where now possible in CryptoConfig
  • Loading branch information
@bartonjs
bartonjs committed Jan 28, 2022
commit a4c3f5b4dd9d89c577639bfdbbb3326722cbaa21
16 changes: 7 additions & 9 deletions src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/CryptoConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ namespace System.Security.Cryptography
public partial class CryptoConfig
{
#if !BROWSER
private const string AssemblyName_Cng = "System.Security.Cryptography.Cng";
private const string AssemblyName_Pkcs = "System.Security.Cryptography.Pkcs";
private const string AssemblyName_X509Certificates = "System.Security.Cryptography.X509Certificates";

private const BindingFlags ConstructorDefault = BindingFlags.Instance | BindingFlags.Public | BindingFlags.CreateInstance;

Expand Down Expand Up @@ -140,7 +138,7 @@ private static Dictionary<string, object> DefaultNameHT
Type RNGCryptoServiceProviderType = typeof(RNGCryptoServiceProvider);
#pragma warning restore SYSLIB0023

string ECDsaCngType = "System.Security.Cryptography.ECDsaCng, " + AssemblyName_Cng;
Type ECDsaCngType = typeof(ECDsaCng);

// Random number generator
ht.Add("RandomNumberGenerator", RNGCryptoServiceProviderType);
Expand Down Expand Up @@ -255,17 +253,17 @@ private static Dictionary<string, object> DefaultNameHT
ht.Add("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", HMACSHA512Type);
// X509 Extensions (custom decoders)
// Basic Constraints OID value
ht.Add("2.5.29.10", "System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension, " + AssemblyName_X509Certificates);
ht.Add("2.5.29.19", "System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension, " + AssemblyName_X509Certificates);
ht.Add("2.5.29.10", typeof(X509Certificates.X509BasicConstraintsExtension));
ht.Add("2.5.29.19", typeof(X509Certificates.X509BasicConstraintsExtension));
// Subject Key Identifier OID value
ht.Add("2.5.29.14", "System.Security.Cryptography.X509Certificates.X509SubjectKeyIdentifierExtension, " + AssemblyName_X509Certificates);
ht.Add("2.5.29.14", typeof(X509Certificates.X509SubjectKeyIdentifierExtension));
// Key Usage OID value
ht.Add("2.5.29.15", "System.Security.Cryptography.X509Certificates.X509KeyUsageExtension, " + AssemblyName_X509Certificates);
ht.Add("2.5.29.15", typeof(X509Certificates.X509KeyUsageExtension));
// Enhanced Key Usage OID value
ht.Add("2.5.29.37", "System.Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension, " + AssemblyName_X509Certificates);
ht.Add("2.5.29.37", typeof(X509Certificates.X509EnhancedKeyUsageExtension));

// X509Chain class can be overridden to use a different chain engine.
ht.Add("X509Chain", "System.Security.Cryptography.X509Certificates.X509Chain, " + AssemblyName_X509Certificates);
ht.Add("X509Chain", typeof(X509Certificates.X509Chain));

// PKCS9 attributes
ht.Add("1.2.840.113549.1.9.3", "System.Security.Cryptography.Pkcs.Pkcs9ContentType, " + AssemblyName_Pkcs);
Expand Down