diff --git a/DataProtection.sln b/DataProtection.sln index 5d906c25f6..f632e6dc89 100644 --- a/DataProtection.sln +++ b/DataProtection.sln @@ -5,15 +5,15 @@ VisualStudioVersion = 14.0.22609.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Security.DataProtection", "src\Microsoft.AspNet.Security.DataProtection\Microsoft.AspNet.Security.DataProtection.kproj", "{1E570CD4-6F12-44F4-961E-005EE2002BC2}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection", "src\Microsoft.AspNet.DataProtection\Microsoft.AspNet.DataProtection.kproj", "{1E570CD4-6F12-44F4-961E-005EE2002BC2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Security.DataProtection.Azure", "src\Microsoft.AspNet.Security.DataProtection.Azure\Microsoft.AspNet.Security.DataProtection.Azure.kproj", "{DF3671D7-A9B1-45F1-A195-0AD596001735}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Azure", "src\Microsoft.AspNet.DataProtection.Azure\Microsoft.AspNet.DataProtection.Azure.kproj", "{DF3671D7-A9B1-45F1-A195-0AD596001735}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Security.DataProtection.Compatibility", "src\Microsoft.AspNet.Security.DataProtection.Compatibility\Microsoft.AspNet.Security.DataProtection.Compatibility.kproj", "{C2FD9D02-AA0E-45FA-8561-EE357A94B73D}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Compatibility", "src\Microsoft.AspNet.DataProtection.Compatibility\Microsoft.AspNet.DataProtection.Compatibility.kproj", "{C2FD9D02-AA0E-45FA-8561-EE357A94B73D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{60336AB3-948D-4D15-A5FB-F32A2B91E814}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Security.DataProtection.Test", "test\Microsoft.AspNet.Security.DataProtection.Test\Microsoft.AspNet.Security.DataProtection.Test.kproj", "{7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Test", "test\Microsoft.AspNet.DataProtection.Test\Microsoft.AspNet.DataProtection.Test.kproj", "{7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Cryptography.Internal", "src\Microsoft.AspNet.Cryptography.Internal\Microsoft.AspNet.Cryptography.Internal.kproj", "{E2779976-A28C-4365-A4BB-4AD854FAF23E}" EndProject diff --git a/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs index 65c143563c..b903a20b6f 100644 --- a/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Cryptography.Internal.Test")] [assembly: InternalsVisibleTo("Microsoft.AspNet.Cryptography.KeyDerivation")] [assembly: InternalsVisibleTo("Microsoft.AspNet.Cryptography.KeyDerivation.Test")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Security.DataProtection")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Security.DataProtection.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Test")] diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs b/src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepository.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs rename to src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepository.cs index 8e728836da..df31596d09 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepository.cs @@ -8,12 +8,12 @@ using System.Linq; using System.Net; using System.Runtime.ExceptionServices; using System.Xml.Linq; -using Microsoft.AspNet.Security.DataProtection.Repositories; +using Microsoft.AspNet.DataProtection.Repositories; using Microsoft.Framework.OptionsModel; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Blob; -namespace Microsoft.AspNet.Security.DataProtection.Azure +namespace Microsoft.AspNet.DataProtection.Azure { /// /// An XML repository backed by Azure blob storage. diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs b/src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs rename to src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs index b694ea5dd8..cd3d44a57e 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs +++ b/src/Microsoft.AspNet.DataProtection.Azure/BlobStorageXmlRepositoryOptions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.WindowsAzure.Storage.Blob; -namespace Microsoft.AspNet.Security.DataProtection.Azure +namespace Microsoft.AspNet.DataProtection.Azure { /// /// Specifies options for configuring an Azure blob storage-based repository. diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/CryptoUtil.cs b/src/Microsoft.AspNet.DataProtection.Azure/CryptoUtil.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/CryptoUtil.cs rename to src/Microsoft.AspNet.DataProtection.Azure/CryptoUtil.cs index b9fb8859f7..b666b6f5cd 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Azure/CryptoUtil.cs +++ b/src/Microsoft.AspNet.DataProtection.Azure/CryptoUtil.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal static class CryptoUtil { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/Microsoft.AspNet.Security.DataProtection.Azure.kproj b/src/Microsoft.AspNet.DataProtection.Azure/Microsoft.AspNet.DataProtection.Azure.kproj similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/Microsoft.AspNet.Security.DataProtection.Azure.kproj rename to src/Microsoft.AspNet.DataProtection.Azure/Microsoft.AspNet.DataProtection.Azure.kproj diff --git a/src/Microsoft.AspNet.Security.DataProtection/NotNullAttribute.cs b/src/Microsoft.AspNet.DataProtection.Azure/NotNullAttribute.cs similarity index 87% rename from src/Microsoft.AspNet.Security.DataProtection/NotNullAttribute.cs rename to src/Microsoft.AspNet.DataProtection.Azure/NotNullAttribute.cs index f65a70a85d..05b991841e 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/NotNullAttribute.cs +++ b/src/Microsoft.AspNet.DataProtection.Azure/NotNullAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection.Azure { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] internal sealed class NotNullAttribute : Attribute diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/project.json b/src/Microsoft.AspNet.DataProtection.Azure/project.json similarity index 83% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/project.json rename to src/Microsoft.AspNet.DataProtection.Azure/project.json index 63a8283b23..79272abe27 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Azure/project.json +++ b/src/Microsoft.AspNet.DataProtection.Azure/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "description": "ASP.NET 5 blob storage repository for DataProtection.", "dependencies": { - "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "WindowsAzure.Storage": "4.3.0" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectionProviderHelper.cs b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectionProviderHelper.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectionProviderHelper.cs rename to src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectionProviderHelper.cs index f05a11cf8e..0237a782a0 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectionProviderHelper.cs +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectionProviderHelper.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Threading; -namespace Microsoft.AspNet.Security.DataProtection.Compatibility +namespace Microsoft.AspNet.DataProtection.Compatibility { internal sealed class DataProtectionProviderHelper { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtector.cs b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtector.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtector.cs rename to src/Microsoft.AspNet.DataProtection.Compatibility/DataProtector.cs index af6c6872fa..b05407d92f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtector.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Compatibility +namespace Microsoft.AspNet.DataProtection.Compatibility { public sealed class DataProtector : DataProtector, IFactorySupportFunctions where T : class, IDataProtectionProviderFactory, new() diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectorHelper.cs b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectorHelper.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectorHelper.cs rename to src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectorHelper.cs index 03d3af7d41..62e756a442 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/DataProtectorHelper.cs +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/DataProtectorHelper.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Threading; -namespace Microsoft.AspNet.Security.DataProtection.Compatibility +namespace Microsoft.AspNet.DataProtection.Compatibility { internal sealed class DataProtectorHelper { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/IDataProtectionProviderFactory.cs b/src/Microsoft.AspNet.DataProtection.Compatibility/IDataProtectionProviderFactory.cs similarity index 83% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/IDataProtectionProviderFactory.cs rename to src/Microsoft.AspNet.DataProtection.Compatibility/IDataProtectionProviderFactory.cs index ddf3dbe191..f470d7827a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/IDataProtectionProviderFactory.cs +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/IDataProtectionProviderFactory.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.Compatibility +namespace Microsoft.AspNet.DataProtection.Compatibility { public interface IDataProtectionProviderFactory { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/IFactorySupportFunctions.cs b/src/Microsoft.AspNet.DataProtection.Compatibility/IFactorySupportFunctions.cs similarity index 86% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/IFactorySupportFunctions.cs rename to src/Microsoft.AspNet.DataProtection.Compatibility/IFactorySupportFunctions.cs index a318be7460..1adc41e58f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/IFactorySupportFunctions.cs +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/IFactorySupportFunctions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.Compatibility +namespace Microsoft.AspNet.DataProtection.Compatibility { internal interface IFactorySupportFunctions { diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/Microsoft.AspNet.Security.DataProtection.Compatibility.kproj b/src/Microsoft.AspNet.DataProtection.Compatibility/Microsoft.AspNet.DataProtection.Compatibility.kproj similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/Microsoft.AspNet.Security.DataProtection.Compatibility.kproj rename to src/Microsoft.AspNet.DataProtection.Compatibility/Microsoft.AspNet.DataProtection.Compatibility.kproj diff --git a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/project.json b/src/Microsoft.AspNet.DataProtection.Compatibility/project.json similarity index 85% rename from src/Microsoft.AspNet.Security.DataProtection.Compatibility/project.json rename to src/Microsoft.AspNet.DataProtection.Compatibility/project.json index ba4ec8e396..519529f83f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Compatibility/project.json +++ b/src/Microsoft.AspNet.DataProtection.Compatibility/project.json @@ -4,7 +4,7 @@ "frameworks": { "net451": { "dependencies": { - "Microsoft.AspNet.Security.DataProtection": "1.0.0-*" + "Microsoft.AspNet.DataProtection": "1.0.0-*" }, "frameworkAssemblies": { "System.Security": "4.0.0.0" diff --git a/src/Microsoft.AspNet.Security.DataProtection/ArraySegmentExtensions.cs b/src/Microsoft.AspNet.DataProtection/ArraySegmentExtensions.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/ArraySegmentExtensions.cs rename to src/Microsoft.AspNet.DataProtection/ArraySegmentExtensions.cs index cadff82795..e5a2a13946 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/ArraySegmentExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/ArraySegmentExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal static class ArraySegmentExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs index 6c61f43316..3941cb2e5f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal static class AuthenticatedEncryptorExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs index a8767fdc0f..dc4b3b7a89 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfiguration.cs @@ -4,9 +4,9 @@ using System; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class CngCbcAuthenticatedEncryptorConfiguration : IAuthenticatedEncryptorConfiguration { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs index 711330a151..a82760350f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// A factory that is able to create a CNG-based IAuthenticatedEncryptor diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs index 171d0ce3cd..b403c37203 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationOptions.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Options for configuring an authenticated encryption mechanism which uses diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs index f673cd2ff9..575f9da317 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs @@ -5,10 +5,10 @@ using System; using System.Linq; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class CngCbcAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs index 5070ad7728..2224bfa71d 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfiguration.cs @@ -4,9 +4,9 @@ using System; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class CngGcmAuthenticatedEncryptorConfiguration : IAuthenticatedEncryptorConfiguration { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs index 996da69abc..6c87153d04 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// A factory that is able to create a CNG-based IAuthenticatedEncryptor diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs index 2b3cca4ae8..bd455d36c9 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationOptions.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Options for configuring an authenticated encryption mechanism which uses diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs index 64d9ca4280..a8abe60a34 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs @@ -5,10 +5,10 @@ using System; using System.Linq; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class CngGcmAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs index b897d668a0..7d49777013 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// The basic interface for providing an authenticated encryption and decryption routine. diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs similarity index 89% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs index 0da7da4b5e..6d4b3f518a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfiguration.cs @@ -3,9 +3,9 @@ using System; using System.Xml.Linq; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Represents a type that contains configuration information about an IAuthenticatedEncryptor diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs similarity index 90% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs index 843de1540c..e25bacbcc8 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationFactory.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Represents a type that can create new authenticated encryption configuration objects. diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs index 0d1fcc38fc..7a211fc8cd 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorConfigurationXmlReader.cs @@ -4,7 +4,7 @@ using System; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Represents a type that can deserialize an XML-serialized IAuthenticatedEncryptorConfiguration. diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs similarity index 82% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs index 7b26d09838..6ae9384f03 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IInternalConfigurationOptions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal interface IInternalConfigurationOptions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs index 6535cb146b..368b570596 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// An optimized encryptor that can avoid buffer allocations in common code paths. diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs index ac7a984083..8e0295711b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfiguration.cs @@ -4,9 +4,9 @@ using System; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class ManagedAuthenticatedEncryptorConfiguration : IAuthenticatedEncryptorConfiguration { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs similarity index 90% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs index e64ddf6c07..e977694d1d 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Managed; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { public sealed class ManagedAuthenticatedEncryptorConfigurationFactory : IAuthenticatedEncryptorConfigurationFactory { diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs index 0d58cfbfc9..4495f0ec94 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationOptions.cs @@ -5,9 +5,9 @@ using System; using System.Reflection; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Managed; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { /// /// Options for configuring an authenticated encryption mechanism which uses diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs rename to src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs index 15410c8f42..d199a7e621 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs +++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs @@ -5,10 +5,10 @@ using System; using System.Linq; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption +namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption { internal sealed class ManagedAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader { diff --git a/src/Microsoft.AspNet.Security.DataProtection/BitHelpers.cs b/src/Microsoft.AspNet.DataProtection/BitHelpers.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/BitHelpers.cs rename to src/Microsoft.AspNet.DataProtection/BitHelpers.cs index 3e60ca7ca1..b9f1e3dc27 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/BitHelpers.cs +++ b/src/Microsoft.AspNet.DataProtection/BitHelpers.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal unsafe static class BitHelpers { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/BCryptGenRandomImpl.cs b/src/Microsoft.AspNet.DataProtection/Cng/BCryptGenRandomImpl.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/BCryptGenRandomImpl.cs rename to src/Microsoft.AspNet.DataProtection/Cng/BCryptGenRandomImpl.cs index 9919cc2644..24ebf57106 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/BCryptGenRandomImpl.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/BCryptGenRandomImpl.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Cryptography.Cng; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { internal unsafe sealed class BCryptGenRandomImpl : IBCryptGenRandom { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/CbcAuthenticatedEncryptor.cs b/src/Microsoft.AspNet.DataProtection/Cng/CbcAuthenticatedEncryptor.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/CbcAuthenticatedEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/Cng/CbcAuthenticatedEncryptor.cs index f44143cdfa..2a27d5633b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/CbcAuthenticatedEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/CbcAuthenticatedEncryptor.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.SP800_108; +using Microsoft.AspNet.DataProtection.SP800_108; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { // An encryptor which does Encrypt(CBC) + HMAC using the Windows CNG (BCrypt*) APIs. // The payloads produced by this encryptor should be compatible with the payloads diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs b/src/Microsoft.AspNet.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs rename to src/Microsoft.AspNet.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs index 48f76f0937..592c5dbf2d 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/CngAuthenticatedEncryptorBase.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { /// /// Base class used for all CNG-related authentication encryption operations. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/DpapiSecretSerializerHelper.cs b/src/Microsoft.AspNet.DataProtection/Cng/DpapiSecretSerializerHelper.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/DpapiSecretSerializerHelper.cs rename to src/Microsoft.AspNet.DataProtection/Cng/DpapiSecretSerializerHelper.cs index ee641fccab..44c0a8b692 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/DpapiSecretSerializerHelper.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/DpapiSecretSerializerHelper.cs @@ -10,7 +10,7 @@ using System.Text; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.SafeHandles; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { internal unsafe static class DpapiSecretSerializerHelper { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/GcmAuthenticatedEncryptor.cs b/src/Microsoft.AspNet.DataProtection/Cng/GcmAuthenticatedEncryptor.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/GcmAuthenticatedEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/Cng/GcmAuthenticatedEncryptor.cs index 802f8feab9..a7998c0885 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/GcmAuthenticatedEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/GcmAuthenticatedEncryptor.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.SP800_108; +using Microsoft.AspNet.DataProtection.SP800_108; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { // GCM is defined in NIST SP 800-38D (http://csrc.nist.gov/publications/nistpubs/800-38D/SP-800-38D.pdf). // Heed closely the uniqueness requirements called out in Sec. 8: the probability that the GCM encryption diff --git a/src/Microsoft.AspNet.Security.DataProtection/Cng/IBCryptGenRandom.cs b/src/Microsoft.AspNet.DataProtection/Cng/IBCryptGenRandom.cs similarity index 85% rename from src/Microsoft.AspNet.Security.DataProtection/Cng/IBCryptGenRandom.cs rename to src/Microsoft.AspNet.DataProtection/Cng/IBCryptGenRandom.cs index 72497de9cd..735d92fdb3 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Cng/IBCryptGenRandom.cs +++ b/src/Microsoft.AspNet.DataProtection/Cng/IBCryptGenRandom.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.Cng +namespace Microsoft.AspNet.DataProtection.Cng { internal unsafe interface IBCryptGenRandom { diff --git a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionExtensions.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionExtensions.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/DataProtectionExtensions.cs rename to src/Microsoft.AspNet.DataProtection/DataProtectionExtensions.cs index 5178eb7bc1..38397f0c68 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// Helpful extension methods for data protection APIs. diff --git a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionOptions.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionOptions.cs similarity index 86% rename from src/Microsoft.AspNet.Security.DataProtection/DataProtectionOptions.cs rename to src/Microsoft.AspNet.DataProtection/DataProtectionOptions.cs index 9f2eefda56..ccd32586f8 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionOptions.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionOptions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { public class DataProtectionOptions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionServiceCollectionExtensions.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/DataProtectionServiceCollectionExtensions.cs rename to src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs index 71d14b4a64..8010230161 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/DataProtectionServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography.Cng; -using Microsoft.AspNet.Security.DataProtection; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; -using Microsoft.AspNet.Security.DataProtection.Dpapi; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; -using Microsoft.AspNet.Security.DataProtection.Repositories; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.Dpapi; +using Microsoft.AspNet.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.Repositories; +using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection diff --git a/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/DefaultDataProtectionProvider.cs similarity index 93% rename from src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection/DefaultDataProtectionProvider.cs index 9f5ed3e54d..75925fe216 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/DefaultDataProtectionProvider.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.KeyManagement; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { public class DefaultDataProtectionProvider : IDataProtectionProvider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/DataProtectionScope.cs b/src/Microsoft.AspNet.DataProtection/Dpapi/DataProtectionScope.cs similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection/Dpapi/DataProtectionScope.cs rename to src/Microsoft.AspNet.DataProtection/Dpapi/DataProtectionScope.cs diff --git a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtectionProvider.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtectionProvider.cs index 5082e385b3..e3c3dad792 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtectionProvider.cs @@ -4,7 +4,7 @@ using System; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Dpapi +namespace Microsoft.AspNet.DataProtection.Dpapi { // Provides a temporary implementation of IDataProtectionProvider for non-Windows machines // or for Windows machines where we can't depend on the user profile. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtector.cs b/src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtector.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtector.cs rename to src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtector.cs index 9689d11c45..df1c6d54a7 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/DpapiDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/Dpapi/DpapiDataProtector.cs @@ -6,7 +6,7 @@ using System.IO; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Dpapi +namespace Microsoft.AspNet.DataProtection.Dpapi { // Provides a temporary implementation of IDataProtector for non-Windows machines // or for Windows machines where we can't depend on the user profile. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/IProtectedData.cs b/src/Microsoft.AspNet.DataProtection/Dpapi/IProtectedData.cs similarity index 89% rename from src/Microsoft.AspNet.Security.DataProtection/Dpapi/IProtectedData.cs rename to src/Microsoft.AspNet.DataProtection/Dpapi/IProtectedData.cs index 3cba943f3d..a12de6c77a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/IProtectedData.cs +++ b/src/Microsoft.AspNet.DataProtection/Dpapi/IProtectedData.cs @@ -4,7 +4,7 @@ using System; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Dpapi +namespace Microsoft.AspNet.DataProtection.Dpapi { internal interface IProtectedData { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/ProtectedDataImpl.cs b/src/Microsoft.AspNet.DataProtection/Dpapi/ProtectedDataImpl.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/Dpapi/ProtectedDataImpl.cs rename to src/Microsoft.AspNet.DataProtection/Dpapi/ProtectedDataImpl.cs index cd5e579f66..709cda218a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Dpapi/ProtectedDataImpl.cs +++ b/src/Microsoft.AspNet.DataProtection/Dpapi/ProtectedDataImpl.cs @@ -3,9 +3,9 @@ using System; using System.Security.Cryptography; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.Dpapi +namespace Microsoft.AspNet.DataProtection.Dpapi { internal unsafe sealed class ProtectedDataImpl : IProtectedData { diff --git a/src/Microsoft.AspNet.Security.DataProtection/EncodingUtil.cs b/src/Microsoft.AspNet.DataProtection/EncodingUtil.cs similarity index 90% rename from src/Microsoft.AspNet.Security.DataProtection/EncodingUtil.cs rename to src/Microsoft.AspNet.DataProtection/EncodingUtil.cs index 84a8822900..0966289874 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/EncodingUtil.cs +++ b/src/Microsoft.AspNet.DataProtection/EncodingUtil.cs @@ -4,7 +4,7 @@ using System; using System.Text; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal unsafe static class EncodingUtil { diff --git a/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs index 179d3f15a2..d5c323bcd5 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/EphemeralDataProtectionProvider.cs @@ -3,11 +3,11 @@ using System; using Microsoft.AspNet.Cryptography.Cng; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; -using Microsoft.AspNet.Security.DataProtection.Cng; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.KeyManagement; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// An IDataProtectionProvider that is transient. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Error.cs b/src/Microsoft.AspNet.DataProtection/Error.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/Error.cs rename to src/Microsoft.AspNet.DataProtection/Error.cs index 74fa5221d2..309625bbb7 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Error.cs +++ b/src/Microsoft.AspNet.DataProtection/Error.cs @@ -5,7 +5,7 @@ using System; using System.Globalization; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal static class Error { diff --git a/src/Microsoft.AspNet.Security.DataProtection/ExceptionExtensions.cs b/src/Microsoft.AspNet.DataProtection/ExceptionExtensions.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/ExceptionExtensions.cs rename to src/Microsoft.AspNet.DataProtection/ExceptionExtensions.cs index 9335f3fc01..126a7bda3f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/ExceptionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/ExceptionExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal static class ExceptionExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/IDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/IDataProtectionProvider.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/IDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection/IDataProtectionProvider.cs index 3403240824..7c44fea90a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/IDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/IDataProtectionProvider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// An interface that can be used to create IDataProtector instances. diff --git a/src/Microsoft.AspNet.Security.DataProtection/IDataProtector.cs b/src/Microsoft.AspNet.DataProtection/IDataProtector.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/IDataProtector.cs rename to src/Microsoft.AspNet.DataProtection/IDataProtector.cs index 353a941710..28a0d571b3 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/IDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/IDataProtector.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// An interface that can provide data protection services. diff --git a/src/Microsoft.AspNet.Security.DataProtection/ISecret.cs b/src/Microsoft.AspNet.DataProtection/ISecret.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/ISecret.cs rename to src/Microsoft.AspNet.DataProtection/ISecret.cs index 0d787f9381..d1e67cfa51 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/ISecret.cs +++ b/src/Microsoft.AspNet.DataProtection/ISecret.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// Represents a secret value. diff --git a/src/Microsoft.AspNet.Security.DataProtection/ITimeLimitedDataProtector.cs b/src/Microsoft.AspNet.DataProtection/ITimeLimitedDataProtector.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/ITimeLimitedDataProtector.cs rename to src/Microsoft.AspNet.DataProtection/ITimeLimitedDataProtector.cs index f4770e410d..acada25c6e 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/ITimeLimitedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/ITimeLimitedDataProtector.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// An interface that can provide data protection services. diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKey.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKey.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKey.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/IKey.cs index 088ae89e09..5356351d7b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKey.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKey.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { /// /// The basic interface for representing an authenticated encryption key. diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyManager.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyManager.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyManager.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyManager.cs index bbf9056e40..9f64f7f9d2 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyManager.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyManager.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { /// /// The basic interface for performing key management operations. diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRing.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRing.cs similarity index 76% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRing.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRing.cs index bae55be34e..b71aaedd1e 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRing.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRing.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal interface IKeyRing { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRingProvider.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRingProvider.cs similarity index 82% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRingProvider.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRingProvider.cs index da8115033d..fd3836c58a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/IKeyRingProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/IKeyRingProvider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal interface IKeyRingProvider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/Key.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/Key.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/Key.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/Key.cs index a5ee6796a8..5366536ced 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/Key.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/Key.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal sealed class Key : IKey { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyExtensions.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyExtensions.cs similarity index 86% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyExtensions.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/KeyExtensions.cs index f1e9740c76..bed820e872 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal static class KeyExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRing.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRing.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRing.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRing.cs index 5bd8773811..6a15e227ac 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRing.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRing.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal sealed class KeyRing : IKeyRing { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs index daf0873218..0837c0dc2d 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal unsafe sealed class KeyRingBasedDataProtectionProvider : IDataProtectionProvider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs index 97841ca503..e7bac85c14 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs @@ -6,16 +6,18 @@ using System.Diagnostics; using System.IO; using System.Threading; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal unsafe sealed class KeyRingBasedDataProtector : IDataProtector { // This magic header identifies a v0 protected data blob. - // It's the high 28 bits of the SHA1 hash of "Microsoft.AspNet.Security.DataProtection.MultiplexingDataProtector" [US-ASCII]. - // The last 4 bits are reserved for version information. - private const uint MAGIC_HEADER_V0 = 0xE123CF30; + // It's the high 28 bits of the SHA1 hash of "Microsoft.AspNet.DataProtection.MultiplexingDataProtector" [US-ASCII]. + // The last nibble reserved for version information. + // There's also the nice property that "F0 C9" can never appear in a well-formed UTF8 sequence, so attempts to + // treat a protected payload as a UTF8-encoded string will fail, and devs can catch the mistake early. + private const uint MAGIC_HEADER_V0 = 0x09F0C9F0; private byte[] _additionalAuthenticatedDataTemplate; private readonly IKeyRingProvider _keyringProvider; diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingProvider.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingProvider.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingProvider.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingProvider.cs index a4efcce090..ce37200737 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/KeyRingProvider.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/KeyRingProvider.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { internal sealed class KeyRingProvider : IKeyRingProvider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/XmlKeyManager.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/KeyManagement/XmlKeyManager.cs rename to src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs index ef8a95a5db..2eebe38f43 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/KeyManagement/XmlKeyManager.cs +++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Reflection; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; -using Microsoft.AspNet.Security.DataProtection.Repositories; -using Microsoft.AspNet.Security.DataProtection.XmlEncryption; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.Repositories; +using Microsoft.AspNet.DataProtection.XmlEncryption; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Security.DataProtection.KeyManagement +namespace Microsoft.AspNet.DataProtection.KeyManagement { public sealed class XmlKeyManager : IKeyManager { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Managed/HashAlgorithmExtensions.cs b/src/Microsoft.AspNet.DataProtection/Managed/HashAlgorithmExtensions.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/Managed/HashAlgorithmExtensions.cs rename to src/Microsoft.AspNet.DataProtection/Managed/HashAlgorithmExtensions.cs index e88b3cdffb..c1717e659f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Managed/HashAlgorithmExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/Managed/HashAlgorithmExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Managed +namespace Microsoft.AspNet.DataProtection.Managed { internal static class HashAlgorithmExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Managed/IManagedGenRandom.cs b/src/Microsoft.AspNet.DataProtection/Managed/IManagedGenRandom.cs similarity index 83% rename from src/Microsoft.AspNet.Security.DataProtection/Managed/IManagedGenRandom.cs rename to src/Microsoft.AspNet.DataProtection/Managed/IManagedGenRandom.cs index 3028068dc7..d707876d10 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Managed/IManagedGenRandom.cs +++ b/src/Microsoft.AspNet.DataProtection/Managed/IManagedGenRandom.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.Managed +namespace Microsoft.AspNet.DataProtection.Managed { internal interface IManagedGenRandom { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs b/src/Microsoft.AspNet.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs index ba53330486..c39738341f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs @@ -5,10 +5,10 @@ using System; using System.IO; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption; -using Microsoft.AspNet.Security.DataProtection.SP800_108; +using Microsoft.AspNet.DataProtection.AuthenticatedEncryption; +using Microsoft.AspNet.DataProtection.SP800_108; -namespace Microsoft.AspNet.Security.DataProtection.Managed +namespace Microsoft.AspNet.DataProtection.Managed { // An encryptor which does Encrypt(CBC) + HMAC using SymmetricAlgorithm and HashAlgorithm. // The payloads produced by this encryptor should be compatible with the payloads diff --git a/src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedGenRandomImpl.cs b/src/Microsoft.AspNet.DataProtection/Managed/ManagedGenRandomImpl.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedGenRandomImpl.cs rename to src/Microsoft.AspNet.DataProtection/Managed/ManagedGenRandomImpl.cs index b89cc8e077..f3de3db91e 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Managed/ManagedGenRandomImpl.cs +++ b/src/Microsoft.AspNet.DataProtection/Managed/ManagedGenRandomImpl.cs @@ -4,7 +4,7 @@ using System; using System.Security.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Managed +namespace Microsoft.AspNet.DataProtection.Managed { internal unsafe sealed class ManagedGenRandomImpl : IManagedGenRandom { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Managed/SymmetricAlgorithmExtensions.cs b/src/Microsoft.AspNet.DataProtection/Managed/SymmetricAlgorithmExtensions.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/Managed/SymmetricAlgorithmExtensions.cs rename to src/Microsoft.AspNet.DataProtection/Managed/SymmetricAlgorithmExtensions.cs index 197f9fe3ac..9542d06ce0 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Managed/SymmetricAlgorithmExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection/Managed/SymmetricAlgorithmExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.Managed +namespace Microsoft.AspNet.DataProtection.Managed { internal static class SymmetricAlgorithmExtensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/MemoryProtection.cs b/src/Microsoft.AspNet.DataProtection/MemoryProtection.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/MemoryProtection.cs rename to src/Microsoft.AspNet.DataProtection/MemoryProtection.cs index b6aa7680ed..2be0be5db0 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/MemoryProtection.cs +++ b/src/Microsoft.AspNet.DataProtection/MemoryProtection.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// Support for generating random data. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Microsoft.AspNet.Security.DataProtection.kproj b/src/Microsoft.AspNet.DataProtection/Microsoft.AspNet.DataProtection.kproj similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection/Microsoft.AspNet.Security.DataProtection.kproj rename to src/Microsoft.AspNet.DataProtection/Microsoft.AspNet.DataProtection.kproj diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/NotNullAttribute.cs b/src/Microsoft.AspNet.DataProtection/NotNullAttribute.cs similarity index 85% rename from src/Microsoft.AspNet.Security.DataProtection.Azure/NotNullAttribute.cs rename to src/Microsoft.AspNet.DataProtection/NotNullAttribute.cs index 00985c02f5..5896ea15d8 100644 --- a/src/Microsoft.AspNet.Security.DataProtection.Azure/NotNullAttribute.cs +++ b/src/Microsoft.AspNet.DataProtection/NotNullAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.Azure +namespace Microsoft.AspNet.DataProtection { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] internal sealed class NotNullAttribute : Attribute diff --git a/src/Microsoft.AspNet.Security.DataProtection/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.DataProtection/Properties/AssemblyInfo.cs similarity index 76% rename from src/Microsoft.AspNet.Security.DataProtection/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.DataProtection/Properties/AssemblyInfo.cs index c81d7655be..c262afe4c7 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.DataProtection/Properties/AssemblyInfo.cs @@ -5,4 +5,4 @@ using System; using System.Runtime.CompilerServices; // for unit testing -[assembly: InternalsVisibleTo("Microsoft.AspNet.Security.DataProtection.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Test")] diff --git a/src/Microsoft.AspNet.Security.DataProtection/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.DataProtection/Properties/Resources.Designer.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/Properties/Resources.Designer.cs rename to src/Microsoft.AspNet.DataProtection/Properties/Resources.Designer.cs index ae6746ee91..563030c9b4 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.DataProtection/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Security.DataProtection internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Security.DataProtection.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNet.DataProtection.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// An error occurred during a cryptographic operation. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Repositories/FileSystemXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/Repositories/FileSystemXmlRepository.cs rename to src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs index c09c085587..a5e219e50b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Repositories/FileSystemXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/FileSystemXmlRepository.cs @@ -8,7 +8,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.Repositories +namespace Microsoft.AspNet.DataProtection.Repositories { /// /// An XML repository backed by a file system. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Repositories/IXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/IXmlRepository.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/Repositories/IXmlRepository.cs rename to src/Microsoft.AspNet.DataProtection/Repositories/IXmlRepository.cs index 572701d922..e5e649594c 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Repositories/IXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/IXmlRepository.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.Repositories +namespace Microsoft.AspNet.DataProtection.Repositories { /// /// The basic interface for storing and retrieving XML elements. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Repositories/RegistryXmlRepository.cs b/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/Repositories/RegistryXmlRepository.cs rename to src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs index 6ebbed369b..e670282c7b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Repositories/RegistryXmlRepository.cs +++ b/src/Microsoft.AspNet.DataProtection/Repositories/RegistryXmlRepository.cs @@ -10,7 +10,7 @@ using System.Security.Principal; using System.Xml.Linq; using Microsoft.Win32; -namespace Microsoft.AspNet.Security.DataProtection.Repositories +namespace Microsoft.AspNet.DataProtection.Repositories { /// /// An XML repository backed by the Windows registry. diff --git a/src/Microsoft.AspNet.Security.DataProtection/Resources.resx b/src/Microsoft.AspNet.DataProtection/Resources.resx similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection/Resources.resx rename to src/Microsoft.AspNet.DataProtection/Resources.resx diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs similarity index 87% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs index 432549207e..dd8089732a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { internal unsafe interface ISP800_108_CTR_HMACSHA512Provider : IDisposable { diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs similarity index 96% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs index a31317918b..89f6b5c987 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs @@ -4,9 +4,9 @@ using System; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Managed; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { internal static class ManagedSP800_108_CTR_HMACSHA512 { diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs index eee810f44c..a9dc0a4846 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { internal unsafe static class SP800_108_CTR_HMACSHA512Extensions { diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs index 903b6f095c..9105d95fc3 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { /// /// Provides an implementation of the SP800-108-CTR-HMACSHA512 key derivation function. diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs index 119bd1ec73..a31935286a 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { internal unsafe sealed class Win7SP800_108_CTR_HMACSHA512Provider : ISP800_108_CTR_HMACSHA512Provider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs b/src/Microsoft.AspNet.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs rename to src/Microsoft.AspNet.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs index 34c506756a..68d8a935e8 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs +++ b/src/Microsoft.AspNet.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -namespace Microsoft.AspNet.Security.DataProtection.SP800_108 +namespace Microsoft.AspNet.DataProtection.SP800_108 { internal unsafe sealed class Win8SP800_108_CTR_HMACSHA512Provider : ISP800_108_CTR_HMACSHA512Provider { diff --git a/src/Microsoft.AspNet.Security.DataProtection/Secret.cs b/src/Microsoft.AspNet.DataProtection/Secret.cs similarity index 99% rename from src/Microsoft.AspNet.Security.DataProtection/Secret.cs rename to src/Microsoft.AspNet.DataProtection/Secret.cs index 06905c39c1..6f04529c52 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/Secret.cs +++ b/src/Microsoft.AspNet.DataProtection/Secret.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.Cng; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Managed; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { /// /// Represents a secret value stored in memory. diff --git a/src/Microsoft.AspNet.Security.DataProtection/TimeLimitedDataProtector.cs b/src/Microsoft.AspNet.DataProtection/TimeLimitedDataProtector.cs similarity index 97% rename from src/Microsoft.AspNet.Security.DataProtection/TimeLimitedDataProtector.cs rename to src/Microsoft.AspNet.DataProtection/TimeLimitedDataProtector.cs index a3542d71bb..a1c4ef1454 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/TimeLimitedDataProtector.cs +++ b/src/Microsoft.AspNet.DataProtection/TimeLimitedDataProtector.cs @@ -5,11 +5,11 @@ using System; using System.Security.Cryptography; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { internal sealed class TimeLimitedDataProtector : ITimeLimitedDataProtector { - internal const string PurposeString = "Microsoft.AspNet.Security.DataProtection.TimeLimitedDataProtector"; + internal const string PurposeString = "Microsoft.AspNet.DataProtection.TimeLimitedDataProtector"; public TimeLimitedDataProtector(IDataProtector innerProtector) { diff --git a/src/Microsoft.AspNet.Security.DataProtection/WebEncoders.cs b/src/Microsoft.AspNet.DataProtection/WebEncoders.cs similarity index 98% rename from src/Microsoft.AspNet.Security.DataProtection/WebEncoders.cs rename to src/Microsoft.AspNet.DataProtection/WebEncoders.cs index 36db7b520a..c963b0c4b4 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/WebEncoders.cs +++ b/src/Microsoft.AspNet.DataProtection/WebEncoders.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.AspNet.Security.DataProtection +namespace Microsoft.AspNet.DataProtection { // Internal copy of HttpAbstractions functionality. internal static class WebEncoders diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs index e9a4388de3..39f6d3e1a5 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs @@ -5,7 +5,7 @@ using System; using System.Security.Cryptography.X509Certificates; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that performs XML encryption using an X.509 certificate. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs similarity index 86% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs index 410ce331c2..dd7d0938d2 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { // from ncrypt.h and ncryptprotect.h [Flags] diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs index 5b08a6e1fb..debd74b5a0 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs @@ -5,9 +5,9 @@ using System; using System.IO; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that can decrypt XML elements which were encrypted using Windows DPAPI:NG. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs similarity index 95% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs index acbd0c3f79..9c2f856f4f 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs @@ -8,10 +8,10 @@ using System.Security.Principal; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; using Microsoft.AspNet.Cryptography.SafeHandles; -using Microsoft.AspNet.Security.DataProtection.Cng; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.KeyManagement; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that can encrypt XML elements using Windows DPAPI:NG. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs similarity index 94% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs index cef503b7e2..c55a6ba47d 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs @@ -5,9 +5,9 @@ using System; using System.IO; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that can decrypt XML elements which were encrypted using Windows DPAPI. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs similarity index 93% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs index 553cda733e..22916e2d24 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs @@ -4,10 +4,10 @@ using System; using System.IO; using System.Xml.Linq; -using Microsoft.AspNet.Security.DataProtection.Cng; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.KeyManagement; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that can encrypt XML elements using Windows DPAPI. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlDecryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs index 7002cff30c..3b7f2a516c 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlDecryptor.cs @@ -4,7 +4,7 @@ using System; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// The basic interface for decrypting an XML element. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs index 733f60739b..019c32d7f4 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/IXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/IXmlEncryptor.cs @@ -4,7 +4,7 @@ using System; using System.Xml.Linq; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// The basic interface for encrypting an XML element. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlDecryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs similarity index 92% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlDecryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs index efceec02ae..e5b8b1ab5b 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlDecryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlDecryptor.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Xml.Linq; using Microsoft.AspNet.Cryptography; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that can decrypt XML elements which were encrypted using a null encryptor. diff --git a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlEncryptor.cs b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs similarity index 91% rename from src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlEncryptor.cs rename to src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs index 3a0c1f09ae..170f4eb6e3 100644 --- a/src/Microsoft.AspNet.Security.DataProtection/XmlEncryption/NullXmlEncryptor.cs +++ b/src/Microsoft.AspNet.DataProtection/XmlEncryption/NullXmlEncryptor.cs @@ -3,9 +3,9 @@ using System; using System.Xml.Linq; -using Microsoft.AspNet.Security.DataProtection.KeyManagement; +using Microsoft.AspNet.DataProtection.KeyManagement; -namespace Microsoft.AspNet.Security.DataProtection.XmlEncryption +namespace Microsoft.AspNet.DataProtection.XmlEncryption { /// /// A class that performs null XML encryption (just returns the plaintext). diff --git a/src/Microsoft.AspNet.Security.DataProtection/project.json b/src/Microsoft.AspNet.DataProtection/project.json similarity index 100% rename from src/Microsoft.AspNet.Security.DataProtection/project.json rename to src/Microsoft.AspNet.DataProtection/project.json diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs b/test/Microsoft.AspNet.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs index 4e2b8b4373..85a80c25af 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs @@ -6,11 +6,11 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using Microsoft.AspNet.Cryptography.Cng; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; using Microsoft.AspNet.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test.Cng +namespace Microsoft.AspNet.DataProtection.Test.Cng { public class CbcAuthenticatedEncryptorTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs b/test/Microsoft.AspNet.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs index 1ccabfc429..1aa5a8afb7 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; using Microsoft.AspNet.Testing.xunit; using Moq; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test.Cng +namespace Microsoft.AspNet.DataProtection.Test.Cng { public unsafe class CngAuthenticatedEncryptorBaseTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs b/test/Microsoft.AspNet.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs index e9ab3f545f..b5d1b757ad 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs @@ -6,11 +6,11 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using Microsoft.AspNet.Cryptography.Cng; -using Microsoft.AspNet.Security.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Cng; using Microsoft.AspNet.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test.Cng +namespace Microsoft.AspNet.DataProtection.Test.Cng { public class GcmAuthenticatedEncryptorTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs b/test/Microsoft.AspNet.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs similarity index 96% rename from test/Microsoft.AspNet.Security.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs rename to test/Microsoft.AspNet.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs index 168ae7075a..99e1762625 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/ConditionalRunTestOnlyIfBcryptAvailableAttribute.cs @@ -6,7 +6,7 @@ using System.Globalization; using Microsoft.AspNet.Cryptography.SafeHandles; using Microsoft.AspNet.Testing.xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { public class ConditionalRunTestOnlyIfBcryptAvailableAttribute : Attribute, ITestCondition { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/DataProtectionExtensionsTests.cs b/test/Microsoft.AspNet.DataProtection.Test/DataProtectionExtensionsTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/DataProtectionExtensionsTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/DataProtectionExtensionsTests.cs index bccbafeb38..c7f50b17cb 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/DataProtectionExtensionsTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/DataProtectionExtensionsTests.cs @@ -7,7 +7,7 @@ using System.Text; using Moq; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { public class DataProtectionExtensionsTests { @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Security.DataProtection.Test // Arrange var innerProtector = new Mock().Object; var outerProtectorMock = new Mock(); - outerProtectorMock.Setup(o => o.CreateProtector("Microsoft.AspNet.Security.DataProtection.TimeLimitedDataProtector")).Returns(innerProtector); + outerProtectorMock.Setup(o => o.CreateProtector("Microsoft.AspNet.DataProtection.TimeLimitedDataProtector")).Returns(innerProtector); // Act var timeLimitedProtector = (TimeLimitedDataProtector)outerProtectorMock.Object.AsTimeLimitedDataProtector(); diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/EphemeralDataProtectionProviderTests.cs b/test/Microsoft.AspNet.DataProtection.Test/EphemeralDataProtectionProviderTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/EphemeralDataProtectionProviderTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/EphemeralDataProtectionProviderTests.cs index b580ebf97a..17e86f2279 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/EphemeralDataProtectionProviderTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/EphemeralDataProtectionProviderTests.cs @@ -6,7 +6,7 @@ using System.Security.Cryptography; using System.Text; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { public class EphemeralDataProtectionProviderTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/ExceptionHelpers.cs b/test/Microsoft.AspNet.DataProtection.Test/ExceptionHelpers.cs similarity index 92% rename from test/Microsoft.AspNet.Security.DataProtection.Test/ExceptionHelpers.cs rename to test/Microsoft.AspNet.DataProtection.Test/ExceptionHelpers.cs index e4394cbc9b..a05290105c 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/ExceptionHelpers.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/ExceptionHelpers.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { internal static class ExceptionHelpers { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs b/test/Microsoft.AspNet.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs similarity index 97% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs index 345bb439f4..812e9bf653 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs @@ -5,10 +5,10 @@ using System; using System.Linq; using System.Security.Cryptography; using System.Text; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Managed; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test.Managed +namespace Microsoft.AspNet.DataProtection.Test.Managed { public class ManagedAuthenticatedEncryptorTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Microsoft.AspNet.Security.DataProtection.Test.kproj b/test/Microsoft.AspNet.DataProtection.Test/Microsoft.AspNet.DataProtection.Test.kproj similarity index 100% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Microsoft.AspNet.Security.DataProtection.Test.kproj rename to test/Microsoft.AspNet.DataProtection.Test/Microsoft.AspNet.DataProtection.Test.kproj diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/Properties/AssemblyInfo.cs b/test/Microsoft.AspNet.DataProtection.Test/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.AspNet.Security.DataProtection.Test/Properties/AssemblyInfo.cs rename to test/Microsoft.AspNet.DataProtection.Test/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/SP800_108/SP800_108Tests.cs b/test/Microsoft.AspNet.DataProtection.Test/SP800_108/SP800_108Tests.cs similarity index 98% rename from test/Microsoft.AspNet.Security.DataProtection.Test/SP800_108/SP800_108Tests.cs rename to test/Microsoft.AspNet.DataProtection.Test/SP800_108/SP800_108Tests.cs index 2705296ed1..69ac3097bf 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/SP800_108/SP800_108Tests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/SP800_108/SP800_108Tests.cs @@ -4,11 +4,11 @@ using System; using System.Security.Cryptography; using System.Text; -using Microsoft.AspNet.Security.DataProtection.SP800_108; +using Microsoft.AspNet.DataProtection.SP800_108; using Microsoft.AspNet.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test.SP800_108 +namespace Microsoft.AspNet.DataProtection.Test.SP800_108 { public unsafe class SP800_108Tests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/SequentialGenRandom.cs b/test/Microsoft.AspNet.DataProtection.Test/SequentialGenRandom.cs similarity index 82% rename from test/Microsoft.AspNet.Security.DataProtection.Test/SequentialGenRandom.cs rename to test/Microsoft.AspNet.DataProtection.Test/SequentialGenRandom.cs index 59dcb6e9cb..fd449f19c7 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/SequentialGenRandom.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/SequentialGenRandom.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Security.DataProtection.Cng; -using Microsoft.AspNet.Security.DataProtection.Managed; +using Microsoft.AspNet.DataProtection.Cng; +using Microsoft.AspNet.DataProtection.Managed; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { internal unsafe class SequentialGenRandom : IBCryptGenRandom, IManagedGenRandom { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/TimeLimitedDataProtectorTests.cs b/test/Microsoft.AspNet.DataProtection.Test/TimeLimitedDataProtectorTests.cs similarity index 98% rename from test/Microsoft.AspNet.Security.DataProtection.Test/TimeLimitedDataProtectorTests.cs rename to test/Microsoft.AspNet.DataProtection.Test/TimeLimitedDataProtectorTests.cs index 671eb65aec..459ced47ee 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/TimeLimitedDataProtectorTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/TimeLimitedDataProtectorTests.cs @@ -6,7 +6,7 @@ using System.Security.Cryptography; using Moq; using Xunit; -namespace Microsoft.AspNet.Security.DataProtection.Test +namespace Microsoft.AspNet.DataProtection.Test { public class TimeLimitedDataProtectorTests { diff --git a/test/Microsoft.AspNet.Security.DataProtection.Test/project.json b/test/Microsoft.AspNet.DataProtection.Test/project.json similarity index 83% rename from test/Microsoft.AspNet.Security.DataProtection.Test/project.json rename to test/Microsoft.AspNet.DataProtection.Test/project.json index 2ee987c400..cc8993067d 100644 --- a/test/Microsoft.AspNet.Security.DataProtection.Test/project.json +++ b/test/Microsoft.AspNet.DataProtection.Test/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", + "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Moq": "4.2.1312.1622", "xunit.runner.kre": "1.0.0-*"