[cpp-xmltooling] 02/03: Fix build for non EC-aware OpenSSL

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=2fac1446e987f978835608b2233505627b0fb4e4

commit 2fac1446e987f978835608b2233505627b0fb4e4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 24 12:57:22 2018 +0100

    Fix build for non EC-aware OpenSSL
---
 xmltoolingtest/BadKeyInfoTest.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xmltoolingtest/BadKeyInfoTest.h b/xmltoolingtest/BadKeyInfoTest.h
index 2d3b881..741f6e3 100644
--- a/xmltoolingtest/BadKeyInfoTest.h
+++ b/xmltoolingtest/BadKeyInfoTest.h
@@ -54,7 +54,6 @@ extern "C" {
 using namespace xmlsignature;
 using namespace xmlencryption;
 
-
 class BadKeyInfoTest : public CxxTest::TestSuite {
 private:
 #define SIGBUFFER_SIZE 1024
@@ -110,7 +109,7 @@ public:
                 bool worked = fileResolverCryptoKeyEC->verifyBase64SignatureDSA(m_toSign, 20, m_outSigEC, m_sigLenEC);
                 TSM_ASSERT("EC Round Trip SignatureFailed", worked);
 #else
-                m_m_sigLenEC = 1;
+                m_sigLenEC = 1;
 #endif
             }
         }
@@ -317,6 +316,8 @@ private:
             }
         }
     }
+#else
+#define ECTest(msg, a, b, c) return
 #endif
 
     void DERTest(const char* file, bool xsecLoadThrows)
@@ -591,7 +592,6 @@ public:
 	DSATest("DSANullCounter.xml", false, true, false, false);
     }
 
-#ifdef XSEC_OPENSSL_HAVE_EC
     void testECGood()
     {
         // Works !  All keys available, no exceptions, no failures
@@ -640,8 +640,6 @@ public:
         ECTest("ECNoCurve.xml", false, true, true);
     }
 
-#endif
-
     void testDERBad()
     {
 	DERTest("DERValueBad.xml", false);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.