Cleaning up root folder (#201)

dotnet · Sep 30, 2020 · 8c254ce · 8c254ce
1 parent d16adf0
commit 8c254ce
Show file tree

Hide file tree

Showing 34 changed files with 9 additions and 102 deletions.
diff --git a/Build.Kerberos.NET.sln b/Build.Kerberos.NET.sln
diff --git a/Directory.build.props b/Directory.build.props
@@ -21,7 +21,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
 
-    <CodeAnalysisRuleSet>..\CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Kerberos.NET.sln b/Kerberos.NET.sln
@@ -7,19 +7,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kerberos.NET", "Kerberos.NE
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Kerberos.NET", "Tests\Tests.Kerberos.NET\Tests.Kerberos.NET.csproj", "{0E4F4471-C2E4-4870-A541-11D14A76AC84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KerbDumpCore", "KerbDumpCore\KerbDumpCore.csproj", "{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KerbDumpCore", "Samples\KerbDumpCore\KerbDumpCore.csproj", "{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{E3EE549C-8245-45E7-A964-E38C78DC9FD3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KerberosClientApp", "KerberosClientApp\KerberosClientApp.csproj", "{5C180587-DA01-4B03-9726-EEB28D70D480}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark.Kerberos.NET", "Tests\Benchmark.Kerberos.NET\Benchmark.Kerberos.NET.csproj", "{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KerberosKdcHostApp", "KerberosKdcHostApp\KerberosKdcHostApp.csproj", "{6963D3CB-B2F1-452B-9339-18851A1C98C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark.Kerberos.NET", "Benchmark.Kerberos.NET\Benchmark.Kerberos.NET.csproj", "{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{12F5B8BF-B0E3-4453-B843-DCEE26F2D4E8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{12F5B8BF-B0E3-4453-B843-DCEE26F2D4E8}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		build.yaml = build.yaml
@@ -29,11 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.json = version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RpcEncodingDebugHost", "RpcEncodingDebugHost\RpcEncodingDebugHost.csproj", "{53B7AEB1-6D10-4BC0-B761-559C4F11F463}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client Tools", "Client Tools", "{8BD43321-3C92-4D6F-B965-783F2CC4CEE1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bruce", "Bruce\Bruce.csproj", "{D12B0644-0D57-45ED-AA0A-AB18D593CCA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bruce", "Bruce\Bruce.csproj", "{D12B0644-0D57-45ED-AA0A-AB18D593CCA3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,22 +47,10 @@ Global
 		{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C180587-DA01-4B03-9726-EEB28D70D480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C180587-DA01-4B03-9726-EEB28D70D480}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C180587-DA01-4B03-9726-EEB28D70D480}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C180587-DA01-4B03-9726-EEB28D70D480}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6963D3CB-B2F1-452B-9339-18851A1C98C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6963D3CB-B2F1-452B-9339-18851A1C98C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6963D3CB-B2F1-452B-9339-18851A1C98C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6963D3CB-B2F1-452B-9339-18851A1C98C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5115DFE1-AD08-4AF5-B88C-F436744D7A3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53B7AEB1-6D10-4BC0-B761-559C4F11F463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53B7AEB1-6D10-4BC0-B761-559C4F11F463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53B7AEB1-6D10-4BC0-B761-559C4F11F463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53B7AEB1-6D10-4BC0-B761-559C4F11F463}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D12B0644-0D57-45ED-AA0A-AB18D593CCA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D12B0644-0D57-45ED-AA0A-AB18D593CCA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D12B0644-0D57-45ED-AA0A-AB18D593CCA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -81,10 +63,7 @@ Global
 		{3066D890-0544-4E13-95FD-1DDCC72FEDA1} = {E3EE549C-8245-45E7-A964-E38C78DC9FD3}
 		{0E4F4471-C2E4-4870-A541-11D14A76AC84} = {8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}
 		{046122A3-9C6F-42E8-A21E-E4F2CD4DBCF8} = {8BD43321-3C92-4D6F-B965-783F2CC4CEE1}
-		{5C180587-DA01-4B03-9726-EEB28D70D480} = {8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}
-		{6963D3CB-B2F1-452B-9339-18851A1C98C0} = {8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}
 		{5115DFE1-AD08-4AF5-B88C-F436744D7A3A} = {8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}
-		{53B7AEB1-6D10-4BC0-B761-559C4F11F463} = {8F0C1D56-CBBB-4B8B-81D1-5D1544AD5C72}
 		{D12B0644-0D57-45ED-AA0A-AB18D593CCA3} = {8BD43321-3C92-4D6F-B965-783F2CC4CEE1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ Note that the constructor parameter for the authenticator is a `KeyTable`. The `
 
 This library comes with an optional utility to decode service tickets. It's easy to use. Just copy the Base64 encoded copy of the ticket into the left textbox. It will decode the unencrypted message if you don't provide a key. It will attempt to decrypt the message if you provide a key. You won't need to provide a host value if the ticket was encrypted using RC4, but it will need a host value if it's encrypted with AES (to derive the salt). Alternatively you could also include a keytab file if you happen to have that too.
 
-![](kerbDump.png?raw=true)
+![](docs/kerbDump.png?raw=true)
 
 Here's a sample of what a sample ticket looks like:
 

diff --git a/RpcEncodingDebugHost/Program.cs b/RpcEncodingDebugHost/Program.cs
diff --git a/RpcEncodingDebugHost/RpcEncodingDebugHost.csproj b/RpcEncodingDebugHost/RpcEncodingDebugHost.csproj
diff --git a/KerbDump/App.config → Samples/KerbDump/App.config b/KerbDump/App.config → Samples/KerbDump/App.config
diff --git a/KerbDump/Form1.Designer.cs → Samples/KerbDump/Form1.Designer.cs b/KerbDump/Form1.Designer.cs → Samples/KerbDump/Form1.Designer.cs
diff --git a/KerbDump/Form1.cs → Samples/KerbDump/Form1.cs b/KerbDump/Form1.cs → Samples/KerbDump/Form1.cs
diff --git a/KerbDump/Form1.resx → Samples/KerbDump/Form1.resx b/KerbDump/Form1.resx → Samples/KerbDump/Form1.resx
diff --git a/KerbDump/KerbDump.csproj → Samples/KerbDump/KerbDump.csproj b/KerbDump/KerbDump.csproj → Samples/KerbDump/KerbDump.csproj
diff --git a/KerbDump/KerberosIgnoreResolver.cs → Samples/KerbDump/KerberosIgnoreResolver.cs b/KerbDump/KerberosIgnoreResolver.cs → Samples/KerbDump/KerberosIgnoreResolver.cs
diff --git a/KerbDump/NoopTransform.cs → Samples/KerbDump/NoopTransform.cs b/KerbDump/NoopTransform.cs → Samples/KerbDump/NoopTransform.cs
diff --git a/KerbDump/Program.cs → Samples/KerbDump/Program.cs b/KerbDump/Program.cs → Samples/KerbDump/Program.cs
diff --git a/KerbDump/Properties/AssemblyInfo.cs → Samples/KerbDump/Properties/AssemblyInfo.cs b/KerbDump/Properties/AssemblyInfo.cs → Samples/KerbDump/Properties/AssemblyInfo.cs
diff --git a/KerbDump/Properties/Resources.Designer.cs → ...KerbDump/Properties/Resources.Designer.cs b/KerbDump/Properties/Resources.Designer.cs → ...KerbDump/Properties/Resources.Designer.cs
diff --git a/KerbDump/Properties/Resources.resx → Samples/KerbDump/Properties/Resources.resx b/KerbDump/Properties/Resources.resx → Samples/KerbDump/Properties/Resources.resx
diff --git a/KerbDump/Properties/Settings.Designer.cs → .../KerbDump/Properties/Settings.Designer.cs b/KerbDump/Properties/Settings.Designer.cs → .../KerbDump/Properties/Settings.Designer.cs
diff --git a/KerbDump/Properties/Settings.settings → ...les/KerbDump/Properties/Settings.settings b/KerbDump/Properties/Settings.settings → ...les/KerbDump/Properties/Settings.settings
diff --git a/KerbDump/packages.config → Samples/KerbDump/packages.config b/KerbDump/packages.config → Samples/KerbDump/packages.config
diff --git a/KerbDumpCore/KerbDumpCore.csproj → Samples/KerbDumpCore/KerbDumpCore.csproj b/KerbDumpCore/KerbDumpCore.csproj → Samples/KerbDumpCore/KerbDumpCore.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Kerberos.NET\Kerberos.NET.csproj" />
+    <ProjectReference Include="..\..\Kerberos.NET\Kerberos.NET.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/KerberosClientApp/KerberosClientApp.csproj → ...erberosClientApp/KerberosClientApp.csproj b/KerberosClientApp/KerberosClientApp.csproj → ...erberosClientApp/KerberosClientApp.csproj
diff --git a/KerberosClientApp/Program.cs → Samples/KerberosClientApp/Program.cs b/KerberosClientApp/Program.cs → Samples/KerberosClientApp/Program.cs
diff --git a/KerberosKdcHostApp/KerberosKdcHostApp.csproj → ...berosKdcHostApp/KerberosKdcHostApp.csproj b/KerberosKdcHostApp/KerberosKdcHostApp.csproj → ...berosKdcHostApp/KerberosKdcHostApp.csproj
diff --git a/KerberosKdcHostApp/Program.cs → Samples/KerberosKdcHostApp/Program.cs b/KerberosKdcHostApp/Program.cs → Samples/KerberosKdcHostApp/Program.cs
diff --git a/...eros.NET/BCryptDiffieHellmanBenchmarks.cs → ...eros.NET/BCryptDiffieHellmanBenchmarks.cs b/...eros.NET/BCryptDiffieHellmanBenchmarks.cs → ...eros.NET/BCryptDiffieHellmanBenchmarks.cs
diff --git a/...erberos.NET/Benchmark.Kerberos.NET.csproj → ...erberos.NET/Benchmark.Kerberos.NET.csproj b/...erberos.NET/Benchmark.Kerberos.NET.csproj → ...erberos.NET/Benchmark.Kerberos.NET.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Kerberos.NET\Kerberos.NET.csproj" />
-    <ProjectReference Include="..\Tests\Tests.Kerberos.NET\Tests.Kerberos.NET.csproj" />
+    <ProjectReference Include="..\..\Kerberos.NET\Kerberos.NET.csproj" />
+    <ProjectReference Include="..\Tests.Kerberos.NET\Tests.Kerberos.NET.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Benchmark.Kerberos.NET/MessageBenchmarks.cs → ...nchmark.Kerberos.NET/MessageBenchmarks.cs b/Benchmark.Kerberos.NET/MessageBenchmarks.cs → ...nchmark.Kerberos.NET/MessageBenchmarks.cs
diff --git a/Benchmark.Kerberos.NET/Program.cs → Tests/Benchmark.Kerberos.NET/Program.cs b/Benchmark.Kerberos.NET/Program.cs → Tests/Benchmark.Kerberos.NET/Program.cs
diff --git a/Benchmark.Kerberos.NET/StressAsReq.cs → Tests/Benchmark.Kerberos.NET/StressAsReq.cs b/Benchmark.Kerberos.NET/StressAsReq.cs → Tests/Benchmark.Kerberos.NET/StressAsReq.cs
diff --git a/Benchmark.Kerberos.NET/StressTgsReq.cs → Tests/Benchmark.Kerberos.NET/StressTgsReq.cs b/Benchmark.Kerberos.NET/StressTgsReq.cs → Tests/Benchmark.Kerberos.NET/StressTgsReq.cs
diff --git a/Benchmark.Kerberos.NET/app.manifest → Tests/Benchmark.Kerberos.NET/app.manifest b/Benchmark.Kerberos.NET/app.manifest → Tests/Benchmark.Kerberos.NET/app.manifest
diff --git a/build.cmd b/build.cmd
diff --git a/kerbDump.png → docs/kerbDump.png b/kerbDump.png → docs/kerbDump.png