Replace custom code with CredentialResolver.
authorScott Cantor <cantor.2@osu.edu>
Wed, 26 Jul 2006 05:16:58 +0000 (05:16 +0000)
committerScott Cantor <cantor.2@osu.edu>
Wed, 26 Jul 2006 05:16:58 +0000 (05:16 +0000)
samltest/data/FilesystemCredentialResolver.xml [new file with mode: 0644]
samltest/samltest.vcproj
samltest/signature/SAML1AssertionTest.h
samltest/signature/SAML1RequestTest.h
samltest/signature/SAML1ResponseTest.h
samltest/signature/SAML2AssertionTest.h
samltest/signature/SAMLSignatureTestBase.h

diff --git a/samltest/data/FilesystemCredentialResolver.xml b/samltest/data/FilesystemCredentialResolver.xml
new file mode 100644 (file)
index 0000000..a69bf43
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FilesystemCredentialResolver>
+    <Key>
+        <Path>../samltest/data/key.pem</Path>
+    </Key>
+    <Certificate>
+        <Path>../samltest/data/cert.pem</Path>
+    </Certificate>
+</FilesystemCredentialResolver>
index ff6ee2b..0771976 100644 (file)
@@ -61,7 +61,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling_1D.lib xerces-c_2D.lib xsec_1D.lib libeay32_0_9_8D.lib"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling_1D.lib xerces-c_2D.lib xsec_1D.lib"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling_1.lib xerces-c_2.lib xsec_1.lib libeay32_0_9_8.lib"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling_1.lib xerces-c_2.lib xsec_1.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
index 1e6f14d..2f5c7c5 100644 (file)
@@ -58,13 +58,14 @@ public:
         // Append a Signature.\r
         Signature* sig=SignatureBuilder::buildSignature();\r
         assertion->setSignature(sig);\r
-        sig->setSigningKey(m_key->clone());\r
+        Locker locker(m_resolver);\r
+        sig->setSigningKey(m_resolver->getKey());\r
 \r
         // Build KeyInfo.\r
         KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();\r
         X509Data* x509Data=X509DataBuilder::buildX509Data();\r
         keyInfo->getX509Datas().push_back(x509Data);\r
-        for_each(m_certs.begin(),m_certs.end(),bind1st(_addcert(),x509Data));\r
+        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));\r
         sig->setKeyInfo(keyInfo);\r
 \r
         // Sign while marshalling.\r
@@ -88,7 +89,7 @@ public:
         \r
         try {\r
             SignatureProfileValidator spv;\r
-            SignatureValidator sv(new KeyResolver(m_key->clone()));\r
+            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));\r
             spv.validate(assertion->getSignature());\r
             sv.validate(assertion->getSignature());\r
         }\r
index b9390a7..46c183c 100644 (file)
@@ -57,13 +57,14 @@ public:
         // Append a Signature.\r
         Signature* sig=SignatureBuilder::buildSignature();\r
         request->setSignature(sig);\r
-        sig->setSigningKey(m_key->clone());\r
+        Locker locker(m_resolver);\r
+        sig->setSigningKey(m_resolver->getKey());\r
 \r
         // Build KeyInfo.\r
         KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();\r
         X509Data* x509Data=X509DataBuilder::buildX509Data();\r
         keyInfo->getX509Datas().push_back(x509Data);\r
-        for_each(m_certs.begin(),m_certs.end(),bind1st(_addcert(),x509Data));\r
+        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));\r
         sig->setKeyInfo(keyInfo);\r
 \r
         // Sign while marshalling.\r
@@ -87,7 +88,7 @@ public:
         \r
         try {\r
             SignatureProfileValidator spv;\r
-            SignatureValidator sv(new KeyResolver(m_key->clone()));\r
+            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));\r
             spv.validate(request->getSignature());\r
             sv.validate(request->getSignature());\r
         }\r
index 6c83b22..6643b5e 100644 (file)
@@ -60,13 +60,14 @@ public:
 \r
         // Append a Signature.\r
         assertion->setSignature(SignatureBuilder::buildSignature());\r
-        assertion->getSignature()->setSigningKey(m_key->clone());\r
+        Locker locker(m_resolver);\r
+        assertion->getSignature()->setSigningKey(m_resolver->getKey());\r
 \r
         // Build KeyInfo.\r
         KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();\r
         X509Data* x509Data=X509DataBuilder::buildX509Data();\r
         keyInfo->getX509Datas().push_back(x509Data);\r
-        for_each(m_certs.begin(),m_certs.end(),bind1st(_addcert(),x509Data));\r
+        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));\r
         assertion->getSignature()->setKeyInfo(keyInfo);\r
 \r
         // Sign assertion while marshalling.\r
@@ -92,7 +93,7 @@ public:
         response->setStatus(status);\r
         response->getAssertions().push_back(assertion);\r
         response->setSignature(SignatureBuilder::buildSignature());\r
-        response->getSignature()->setSigningKey(m_key->clone());\r
+        response->getSignature()->setSigningKey(m_resolver->getKey());\r
         response->getSignature()->setKeyInfo(keyInfo->cloneKeyInfo());\r
 \r
         // Sign response while marshalling.\r
@@ -120,7 +121,7 @@ public:
             spv.validate(assertion->getSignature());\r
             spv.validate(response->getSignature());\r
 \r
-            SignatureValidator sv(new KeyResolver(m_key->clone()));\r
+            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));\r
             sv.validate(assertion->getSignature());\r
             sv.validate(response->getSignature());\r
         }\r
index 0245bce..db45a15 100644 (file)
@@ -66,13 +66,14 @@ public:
         // Append a Signature.\r
         Signature* sig=SignatureBuilder::buildSignature();\r
         assertion->setSignature(sig);\r
-        sig->setSigningKey(m_key->clone());\r
+        Locker locker(m_resolver);\r
+        sig->setSigningKey(m_resolver->getKey());\r
 \r
         // Build KeyInfo.\r
         KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();\r
         X509Data* x509Data=X509DataBuilder::buildX509Data();\r
         keyInfo->getX509Datas().push_back(x509Data);\r
-        for_each(m_certs.begin(),m_certs.end(),bind1st(_addcert(),x509Data));\r
+        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));\r
         sig->setKeyInfo(keyInfo);\r
 \r
         // Sign while marshalling.\r
@@ -96,7 +97,7 @@ public:
         \r
         try {\r
             SignatureProfileValidator spv;\r
-            SignatureValidator sv(new KeyResolver(m_key->clone()));\r
+            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));\r
             spv.validate(assertion->getSignature());\r
             sv.validate(assertion->getSignature());\r
         }\r
index 24a8873..d0ec194 100644 (file)
 \r
 #include "internal.h"\r
 #include <saml/signature/SignatureProfileValidator.h>\r
-#include <xmltooling/signature/SignatureValidator.h>\r
-\r
 \r
-#include <openssl/pem.h>\r
-#include <xsec/enc/XSECKeyInfoResolverDefault.hpp>\r
-#include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>\r
-#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>\r
-#include <xsec/enc/XSECCryptoException.hpp>\r
-#include <xsec/framework/XSECException.hpp>\r
+#include <xmltooling/signature/CredentialResolver.h>\r
+#include <xmltooling/signature/SignatureValidator.h>\r
 \r
 using namespace xmlsignature;\r
 \r
@@ -40,39 +34,22 @@ public:
 \r
 class SAMLSignatureTestBase : public SAMLObjectBaseTestCase {\r
 protected:\r
-    XSECCryptoKey* m_key;\r
-    vector<XSECCryptoX509*> m_certs;\r
+    CredentialResolver* m_resolver;\r
 public:\r
     void setUp() {\r
+        m_resolver=NULL;\r
         SAMLObjectBaseTestCase::setUp();\r
-        string keypath=data_path + "key.pem";\r
-        BIO* in=BIO_new(BIO_s_file_internal());\r
-        if (in && BIO_read_filename(in,keypath.c_str())>0) {\r
-            EVP_PKEY* pkey=PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);\r
-            if (pkey) {\r
-                m_key=new OpenSSLCryptoKeyRSA(pkey);\r
-                EVP_PKEY_free(pkey);\r
-            }\r
-        }\r
-        if (in) BIO_free(in);\r
-        TS_ASSERT(m_key!=NULL);\r
-\r
-        string certpath=data_path + "cert.pem";\r
-        in=BIO_new(BIO_s_file_internal());\r
-        if (in && BIO_read_filename(in,certpath.c_str())>0) {\r
-            X509* x=NULL;\r
-            while (x=PEM_read_bio_X509(in,NULL,NULL,NULL)) {\r
-                m_certs.push_back(new OpenSSLCryptoX509(x));\r
-                X509_free(x);\r
-            }\r
-        }\r
-        if (in) BIO_free(in);\r
-        TS_ASSERT(m_certs.size()>0);\r
+        string config = data_path + "FilesystemCredentialResolver.xml";\r
+        ifstream in(config.c_str());\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);\r
+        XercesJanitor<DOMDocument> janitor(doc);\r
+        m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(\r
+            FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()\r
+            );\r
     }\r
 \r
     void tearDown() {\r
+        delete m_resolver;\r
         SAMLObjectBaseTestCase::tearDown();\r
-        delete m_key;\r
-        for_each(m_certs.begin(),m_certs.end(),xmltooling::cleanup<XSECCryptoX509>());\r
     }\r
 };\r