huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DataProtectionServices should prefer registry over defaults 

Comment cleanup in CNG-GCM ExportToXml
This commit is contained in:
Levi B 2015-03-12 14:22:45 -07:00
parent 4f2288c3da
commit 7fe33e8159
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs
View File

@ -45,7 +45,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationM
} }
var rootElement = new XElement("descriptor", var rootElement = new XElement("descriptor",
new XComment(" Algorithms provided by Windows CNG, using GCM mode encryption and validation "), new XComment(" Algorithms provided by Windows CNG, using Galois/Counter Mode encryption and validation "),
encryptionElement, encryptionElement,
MasterKey.ToMasterKeyElement()); MasterKey.ToMasterKeyElement());

17
src/Microsoft.AspNet.DataProtection/DataProtectionServices.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.Cng;
using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.DataProtection;
using Microsoft.AspNet.DataProtection.AuthenticatedEncryption.ConfigurationModel;
using Microsoft.AspNet.DataProtection.Cng; using Microsoft.AspNet.DataProtection.Cng;
using Microsoft.AspNet.DataProtection.KeyManagement; using Microsoft.AspNet.DataProtection.KeyManagement;
using Microsoft.AspNet.DataProtection.Repositories; using Microsoft.AspNet.DataProtection.Repositories;
@ -22,9 +23,6 @@ namespace Microsoft.Framework.DependencyInjection
/// </summary> /// </summary>
public static IEnumerable<ServiceDescriptor> GetDefaultServices() public static IEnumerable<ServiceDescriptor> GetDefaultServices()
{ {
// Provide the default algorithmic information.
yield return DataProtectionServiceDescriptors.IAuthenticatedEncryptorConfiguration_Default();
// The default key services are a strange beast. We don't want to return // The default key services are a strange beast. We don't want to return
// IXmlEncryptor and IXmlRepository as-is because they almost always have to be // IXmlEncryptor and IXmlRepository as-is because they almost always have to be
// set as a matched pair. Instead, our built-in key manager will use a meta-service // set as a matched pair. Instead, our built-in key manager will use a meta-service
@ -98,10 +96,21 @@ namespace Microsoft.Framework.DependencyInjection
// Hook up the logic which allows populating default options // Hook up the logic which allows populating default options
yield return DataProtectionServiceDescriptors.ConfigureOptions_DataProtectionOptions(); yield return DataProtectionServiceDescriptors.ConfigureOptions_DataProtectionOptions();
// Finally, read and apply policy from the registry, overriding any other defaults. // Read and apply policy from the registry, overriding any other defaults.
bool encryptorConfigurationReadFromRegistry = false;
foreach (var descriptor in RegistryPolicyResolver.ResolveDefaultPolicy()) foreach (var descriptor in RegistryPolicyResolver.ResolveDefaultPolicy())
{ {
yield return descriptor; yield return descriptor;
if (descriptor.ServiceType == typeof(IAuthenticatedEncryptorConfiguration))
{
encryptorConfigurationReadFromRegistry = true;
}
}
// Finally, provide a fallback encryptor configuration if one wasn't already specified.
if (!encryptorConfigurationReadFromRegistry)
{
yield return DataProtectionServiceDescriptors.IAuthenticatedEncryptorConfiguration_Default();
} }
} }
} }