Skip to content

Updated tooling, converted to dotnet core/netstandard #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated tooling, converted to dotnet core/netstandard #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45cd22
updated to new tooling; dotnet core/standard; update windows forms to…
kdaveid Feb 4, 2020
8a4aae8
added System.Drawing again (wrongly removed
kdaveid Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ _ReSharper*/
~$*

# Git temp files
*.orig
*.orig

.vs/
90 changes: 51 additions & 39 deletions SecretSplitter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecretSplitter", "SecretSplitter\SecretSplitter.csproj", "{4D00E332-909A-40C2-ACE4-2A5652E177AB}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecretSplitter", "SecretSplitter\SecretSplitter.csproj", "{4D00E332-909A-40C2-ACE4-2A5652E177AB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ssss", "Ssss\Ssss.csproj", "{66078722-54F0-4050-9ABA-0CA724222076}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ssss", "Ssss\Ssss.csproj", "{66078722-54F0-4050-9ABA-0CA724222076}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecretSplitterGui", "SecretSplitterGui\SecretSplitterGui.csproj", "{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8F35BEA3-BC2C-40DF-A570-34B99CDBA48E}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -16,10 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.txt = README.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecretSplitterGui", "SecretSplitterGui\SecretSplitterGui.csproj", "{D18D06AD-3941-4923-B43C-517EC8FB178C}"
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = SecretSplitter.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Expand All @@ -39,37 +38,50 @@ Global
{4D00E332-909A-40C2-ACE4-2A5652E177AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4D00E332-909A-40C2-ACE4-2A5652E177AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4D00E332-909A-40C2-ACE4-2A5652E177AB}.Release|x86.ActiveCfg = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Any CPU.ActiveCfg = Debug|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Mixed Platforms.Build.0 = Debug|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|x86.ActiveCfg = Debug|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|x86.Build.0 = Debug|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Any CPU.ActiveCfg = Release|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Mixed Platforms.ActiveCfg = Release|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Mixed Platforms.Build.0 = Release|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Release|x86.ActiveCfg = Release|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Release|x86.Build.0 = Release|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Any CPU.ActiveCfg = Debug|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Mixed Platforms.Build.0 = Debug|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|x86.ActiveCfg = Debug|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|x86.Build.0 = Debug|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Any CPU.ActiveCfg = Release|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Mixed Platforms.ActiveCfg = Release|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|x86.ActiveCfg = Release|x86
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|x86.Build.0 = Release|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Debug|Any CPU.ActiveCfg = Debug|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Debug|Mixed Platforms.Build.0 = Debug|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Debug|x86.ActiveCfg = Debug|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Debug|x86.Build.0 = Debug|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Release|Any CPU.ActiveCfg = Release|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Release|Mixed Platforms.ActiveCfg = Release|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Release|Mixed Platforms.Build.0 = Release|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Release|x86.ActiveCfg = Release|x86
{D6E836CC-5F25-4F81-BE0B-2F0C12559A3C}.Release|x86.Build.0 = Release|x86
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|x86.ActiveCfg = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Debug|x86.Build.0 = Debug|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Any CPU.Build.0 = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|x86.ActiveCfg = Release|Any CPU
{66078722-54F0-4050-9ABA-0CA724222076}.Release|x86.Build.0 = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|x86.ActiveCfg = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Debug|x86.Build.0 = Debug|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Any CPU.Build.0 = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|x86.ActiveCfg = Release|Any CPU
{28FE0854-E90B-48A9-81F1-A94A6CE3FD2D}.Release|x86.Build.0 = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|x86.ActiveCfg = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Debug|x86.Build.0 = Debug|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|Any CPU.Build.0 = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|x86.ActiveCfg = Release|Any CPU
{D18D06AD-3941-4923-B43C-517EC8FB178C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {071E8DE4-E43D-47B0-BF12-39C1C5484808}
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = SecretSplitter.vsmdi
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion SecretSplitter/Algebra/FiniteFieldPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ internal static bool TryParse(Match match, out FiniteFieldPoint result) {
result = new FiniteFieldPoint(x, y);
return true;
}
catch(Exception exception) {
catch(Exception) {
result = null;
return false;
}
Expand Down
23 changes: 0 additions & 23 deletions SecretSplitter/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

68 changes: 5 additions & 63 deletions SecretSplitter/SecretSplitter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4D00E332-909A-40C2-ACE4-2A5652E177AB}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Moserware</RootNamespace>
<AssemblyName>Moserware.SecretSplitter</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Security" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="Numerics\BigIntegerExtensions.cs" />
<Compile Include="Algebra\FiniteFieldPoint.cs" />
<Compile Include="Algebra\IrreduciblePolynomial.cs" />
<Compile Include="Algebra\FiniteFieldPolynomial.cs" />
<Compile Include="Algebra\LagrangeInterpolator.cs" />
<Compile Include="ByteExtensions.cs" />
<Compile Include="Security\Cryptography\HexadecimalPasswordGenerator.cs" />
<Compile Include="Security\Cryptography\OpenPgp.cs" />
<Compile Include="Security\Cryptography\SecretEncoder.cs" />
<Compile Include="Security\Cryptography\SecretCombiner.cs" />
<Compile Include="Security\Cryptography\Diffuser.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Security\Cryptography\SecretShare.cs" />
<Compile Include="Security\Cryptography\SecretSplitter.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
6 changes: 6 additions & 0 deletions SecretSplitterGui/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
2 changes: 1 addition & 1 deletion SecretSplitterGui/MainForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SecretSplitterGui/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,11 @@ private void btnRecover_Click(object sender, EventArgs e) {
}
}
}
catch(ModificationDetectedException modificationDetectedException) {
catch(ModificationDetectedException) {
ShowError("It looks like the file was tampered with or the given secret pieces were invalid.",
"Modification Detected");
}
catch(Exception exception) {
catch(Exception) {
ShowError("There was an error while trying to decrypt the file. Please check to make sure that you only typed in the fewest number of secret pieces needed and that you selected the proper file to decrypt and that the file wasn't tampered.");
}
}
Expand Down
21 changes: 11 additions & 10 deletions SecretSplitterGui/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions SecretSplitterGui/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading