Skip to content

Commit e94246a

Browse files
committed
Move security logic to new project
1 parent 79f0231 commit e94246a

9 files changed

Lines changed: 105 additions & 5 deletions

File tree

CSF.Core.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.IniDocuments", "CSF.Ini
4848
EndProject
4949
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Caches", "CSF.Caches\CSF.Caches.csproj", "{6644C95A-70A7-4A7B-903D-E087037FDA26}"
5050
EndProject
51+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Security", "CSF.Security\CSF.Security.csproj", "{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}"
52+
EndProject
5153
Global
5254
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5355
Debug|Any CPU = Debug|Any CPU
@@ -118,6 +120,10 @@ Global
118120
{CA00FFB0-ABD0-431D-987F-0DE5BA886575}.Debug|Any CPU.Build.0 = Debug|Any CPU
119121
{CA00FFB0-ABD0-431D-987F-0DE5BA886575}.Release|Any CPU.ActiveCfg = Release|Any CPU
120122
{CA00FFB0-ABD0-431D-987F-0DE5BA886575}.Release|Any CPU.Build.0 = Release|Any CPU
123+
{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
124+
{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}.Debug|Any CPU.Build.0 = Debug|Any CPU
125+
{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}.Release|Any CPU.ActiveCfg = Release|Any CPU
126+
{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}.Release|Any CPU.Build.0 = Release|Any CPU
121127
{E563D7BC-1AB1-4AFB-8533-51315437C6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122128
{E563D7BC-1AB1-4AFB-8533-51315437C6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
123129
{E563D7BC-1AB1-4AFB-8533-51315437C6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU

CSF.Security/CSF.Security.csproj

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>CSF.Security</RootNamespace>
11+
<AssemblyName>CSF.Security</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<DebugSymbols>true</DebugSymbols>
16+
<DebugType>full</DebugType>
17+
<Optimize>false</Optimize>
18+
<OutputPath>bin\Debug</OutputPath>
19+
<DefineConstants>DEBUG;</DefineConstants>
20+
<ErrorReport>prompt</ErrorReport>
21+
<WarningLevel>4</WarningLevel>
22+
<ConsolePause>false</ConsolePause>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<DebugType>full</DebugType>
26+
<Optimize>true</Optimize>
27+
<OutputPath>bin\Release</OutputPath>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<ConsolePause>false</ConsolePause>
31+
</PropertyGroup>
32+
<ItemGroup>
33+
<Reference Include="System" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<Compile Include="Properties\AssemblyInfo.cs" />
37+
<Compile Include="BinaryHashAndSaltPair.cs" />
38+
<Compile Include="BinaryPasswordService.cs" />
39+
<Compile Include="IHashAndSaltPair.cs" />
40+
<Compile Include="IPasswordService.cs" />
41+
</ItemGroup>
42+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
43+
</Project>
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
//
2+
// AssemblyInfo.cs
3+
//
4+
// Author:
5+
// Craig Fowler <craig@craigfowler.me.uk>
6+
//
7+
// Copyright (c) 2016 Craig Fowler
8+
//
9+
// Permission is hereby granted, free of charge, to any person obtaining a copy
10+
// of this software and associated documentation files (the "Software"), to deal
11+
// in the Software without restriction, including without limitation the rights
12+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
// copies of the Software, and to permit persons to whom the Software is
14+
// furnished to do so, subject to the following conditions:
15+
//
16+
// The above copyright notice and this permission notice shall be included in
17+
// all copies or substantial portions of the Software.
18+
//
19+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
// THE SOFTWARE.
26+
using System.Reflection;
27+
using System.Runtime.CompilerServices;
28+
29+
// Information about this assembly is defined by the following attributes.
30+
// Change them to the values specific to your project.
31+
32+
[assembly: AssemblyTitle("CSF.Security")]
33+
[assembly: AssemblyDescription("")]
34+
[assembly: AssemblyConfiguration("")]
35+
[assembly: AssemblyCompany("CSF Software Limited")]
36+
[assembly: AssemblyProduct("")]
37+
[assembly: AssemblyCopyright("Craig Fowler")]
38+
[assembly: AssemblyTrademark("")]
39+
[assembly: AssemblyCulture("")]
40+
41+
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
42+
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
43+
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
44+
45+
[assembly: AssemblyVersion("1.0.*")]
46+
47+
// The following attributes are used to specify the signing key for the assembly,
48+
// if desired. See the Mono documentation for more information about signing.
49+
50+
//[assembly: AssemblyDelaySign(false)]
51+
//[assembly: AssemblyKeyFile("")]
52+

CSF/CSF.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
<Compile Include="ICalculator.cs" />
4848
<Compile Include="SimpleCalculator.cs" />
4949
<Compile Include="IO\FileSystemInfoExtensions.cs" />
50-
<Compile Include="Security\IPasswordService.cs" />
51-
<Compile Include="Security\IHashAndSaltPair.cs" />
52-
<Compile Include="Security\BinaryHashAndSaltPair.cs" />
53-
<Compile Include="Security\BinaryPasswordService.cs" />
5450
<Compile Include="Fraction.cs" />
5551
<Compile Include="PrimeFactoriser.cs" />
5652
<Compile Include="VersionExtensions.cs" />
@@ -83,7 +79,6 @@
8379
<ItemGroup>
8480
<Folder Include="IO\" />
8581
<Folder Include="Collections\" />
86-
<Folder Include="Security\" />
8782
<Folder Include="Resources\" />
8883
</ItemGroup>
8984
<ItemGroup>

Test.CSF/Test.CSF.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@
163163
<Project>{6644C95A-70A7-4A7B-903D-E087037FDA26}</Project>
164164
<Name>CSF.Caches</Name>
165165
</ProjectReference>
166+
<ProjectReference Include="..\CSF.Security\CSF.Security.csproj">
167+
<Project>{D46ED91C-6D2F-4B18-82B3-6EB2F001C121}</Project>
168+
<Name>CSF.Security</Name>
169+
</ProjectReference>
166170
</ItemGroup>
167171
<ItemGroup>
168172
<Folder Include="IO\" />

0 commit comments

Comments
 (0)