Commit 3ca6e994 3ca6e994c9235320670887b15d9228cc5db26f32 by Christian Gerdes

Fungerande PEM inläsning, behöver dock testas så att privata nyckeln i cert stor…

…e faktiskt går att använda efter installation.
1 parent 9e479a05
...@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ...@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
8 LICENSE = LICENSE 8 LICENSE = LICENSE
9 LIL_VSTT_Plugins.vsmdi = LIL_VSTT_Plugins.vsmdi 9 LIL_VSTT_Plugins.vsmdi = LIL_VSTT_Plugins.vsmdi
10 Local.testsettings = Local.testsettings 10 Local.testsettings = Local.testsettings
11 Notes.md = Notes.md
11 README.md = README.md 12 README.md = README.md
12 EndProjectSection 13 EndProjectSection
13 EndProject 14 EndProject
......
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
55 <ItemGroup> 55 <ItemGroup>
56 <None Include="Registry\Schannel_high_withclient.reg" /> 56 <None Include="Registry\Schannel_high_withclient.reg" />
57 </ItemGroup> 57 </ItemGroup>
58 <ItemGroup>
59 <ProjectReference Include="..\crypto\crypto.Net45.csproj">
60 <Project>{45473847-8af8-4baf-b768-442c6875b8cf}</Project>
61 <Name>crypto.Net45</Name>
62 </ProjectReference>
63 </ItemGroup>
58 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 64 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
59 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 65 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
60 Other similar extension points exist, see Microsoft.Common.targets. 66 Other similar extension points exist, see Microsoft.Common.targets.
......
1 # Notes on Bouncy Castle integration
2
3 Once we have a certificate, it can be converted to .NET:
4
5 DotNetUtilities.ToX509Certificate((Org.BouncyCastle.X509.X509Certificate)newCert)
6
7 http://stackoverflow.com/questions/6128541/bouncycastle-privatekey-to-x509certificate2-privatekey
8
...@@ -43,7 +43,10 @@ ...@@ -43,7 +43,10 @@
43 </Request> 43 </Request>
44 </Items> 44 </Items>
45 <ContextParameters> 45 <ContextParameters>
46 <ContextParameter Name="CertFile" Value="U:\projekt\MjukaCertifikat\Interna certifikat_2016\P12\Auth - FN10007 EN10007.p12" /> 46 <ContextParameter Name="PEM-Key" Value="U:\projekt\MjukaCertifikat\Interna certifikat_2016\PEM\Auth_FN10007_EN10007-key.pem" />
47 <ContextParameter Name="PEM-Cert" Value="U:\projekt\MjukaCertifikat\Interna certifikat_2016\PEM\Auth_FN10007_EN10007-cert.pem" />
48 <ContextParameter Name="PEM" Value="U:\projekt\MjukaCertifikat\Interna certifikat_2016\PEM\Auth_FN10007_EN10007.pem" />
49 <ContextParameter Name="PFX" Value="U:\projekt\MjukaCertifikat\Interna certifikat_2016\P12\Auth - FN10007 EN10007.p12" />
47 </ContextParameters> 50 </ContextParameters>
48 <ValidationRules> 51 <ValidationRules>
49 <ValidationRule Classname="Microsoft.VisualStudio.TestTools.WebTesting.Rules.ValidateResponseUrl, Microsoft.VisualStudio.QualityTools.WebTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" DisplayName="Response URL" Description="Validates that the response URL after redirects are followed is the same as the recorded response URL. QueryString parameters are ignored." Level="Low" ExectuionOrder="BeforeDependents" /> 52 <ValidationRule Classname="Microsoft.VisualStudio.TestTools.WebTesting.Rules.ValidateResponseUrl, Microsoft.VisualStudio.QualityTools.WebTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" DisplayName="Response URL" Description="Validates that the response URL after redirects are followed is the same as the recorded response URL. QueryString parameters are ignored." Level="Low" ExectuionOrder="BeforeDependents" />
...@@ -68,10 +71,10 @@ ...@@ -68,10 +71,10 @@
68 <WebTestPlugin Classname="LIL_VSTT_Plugins.ClientCertificatePlugin, LIL_VSTT_Plugins, Version=1.3.0.0, Culture=neutral, PublicKeyToken=null" DisplayName="Client Certificate" Description="(C) Copyright 2016 LIGHTS IN LINE AB&#xD;&#xA;Sätter webtestet att använda ett specifikt client cert för SSL. Certifikatet behöver inte installeras i certstore först."> 71 <WebTestPlugin Classname="LIL_VSTT_Plugins.ClientCertificatePlugin, LIL_VSTT_Plugins, Version=1.3.0.0, Culture=neutral, PublicKeyToken=null" DisplayName="Client Certificate" Description="(C) Copyright 2016 LIGHTS IN LINE AB&#xD;&#xA;Sätter webtestet att använda ett specifikt client cert för SSL. Certifikatet behöver inte installeras i certstore först.">
69 <RuleParameters> 72 <RuleParameters>
70 <RuleParameter Name="pCertificatePath" Value="" /> 73 <RuleParameter Name="pCertificatePath" Value="" />
71 <RuleParameter Name="pCertificatePathParameter" Value="CertFile" /> 74 <RuleParameter Name="pCertificatePathParameter" Value="PEM" />
72 <RuleParameter Name="pCertificatePassword" Value="abcd1234" /> 75 <RuleParameter Name="pCertificatePassword" Value="abcd1234" />
73 <RuleParameter Name="pCertificatePasswordParameter" Value="" /> 76 <RuleParameter Name="pCertificatePasswordParameter" Value="" />
74 <RuleParameter Name="pDebug" Value="False" /> 77 <RuleParameter Name="pDebug" Value="True" />
75 <RuleParameter Name="pInstallTrusted" Value="True" /> 78 <RuleParameter Name="pInstallTrusted" Value="True" />
76 <RuleParameter Name="pInstallUntrusted" Value="True" /> 79 <RuleParameter Name="pInstallUntrusted" Value="True" />
77 </RuleParameters> 80 </RuleParameters>
......
1 #if !(NETCF_1_0 || SILVERLIGHT || PORTABLE)
2
3 using System; 1 using System;
4 using System.Security.Cryptography; 2 using System.Security.Cryptography;
5 using SystemX509 = System.Security.Cryptography.X509Certificates; 3 using SystemX509 = System.Security.Cryptography.X509Certificates;
...@@ -242,4 +240,3 @@ namespace Org.BouncyCastle.Security ...@@ -242,4 +240,3 @@ namespace Org.BouncyCastle.Security
242 } 240 }
243 } 241 }
244 242
245 #endif
......