[cpp-xmltooling] branch openssl1.1 updated: CPPXT-110 Do niot build OpenSSL1.1 tests unless it is present

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/openssl1.1 by this push:
       new  b450d43   CPPXT-110  Do niot build OpenSSL1.1 tests unless it is present
b450d43 is described below

commit b450d43e417afab10f1cd32d3c41e2d39a62e56c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Oct 16 15:37:45 2016 +0100

    CPPXT-110  Do niot build OpenSSL1.1 tests unless it is present
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
---
 xmltoolingtest/OpenSSL1_1Test.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xmltoolingtest/OpenSSL1_1Test.h b/xmltoolingtest/OpenSSL1_1Test.h
index 1aa440a..e29716a 100644
--- a/xmltoolingtest/OpenSSL1_1Test.h
+++ b/xmltoolingtest/OpenSSL1_1Test.h
@@ -36,8 +36,8 @@ public:
 
     void tearDown() {
     }
-
     void testRSA() {
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000)
         string pathname = data_path + "key.pem";
         auto_ptr<OpenSSLCryptoKeyRSA> key1(dynamic_cast<OpenSSLCryptoKeyRSA*>(SecurityHelper::loadKeyFromFile(pathname.c_str())));
         
@@ -63,10 +63,13 @@ public:
 
         TSM_ASSERT("Private Matches", SecurityHelper::matches(*privateOnly.get(),*key1.get()));
 #endif
+#endif
     }
 
 private:
 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000)
+
     static bool deepEquals(OpenSSLCryptoKeyRSA * key1, OpenSSLCryptoKeyRSA *key2) {
         if (key1->getKeyType() != key2->getKeyType())
             return false;
@@ -95,4 +98,5 @@ private:
 
         return true;
     }
+#endif
 };
\ No newline at end of file

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