[xmltooling] 21/24: CPPXT-110 OpenSSL 1.1: OpenSSL1.1 changes to newly introduced tests

[Ferenc Wágner]

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

wferi pushed a commit to branch master
in repository xmltooling.

commit cbdd797b664e20b01c2b3d25b127bbde5712270f
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Mon Nov 28 14:19:54 2016 +0000

    CPPXT-110 OpenSSL 1.1: OpenSSL1.1 changes to newly introduced tests
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
    
    Plus a couple of clean-ups in the build environment.
---
 Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj      |  2 +-
 Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.user |  6 +++---
 xmltoolingtest/InlineKeyResolverTest.h                   | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj b/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj
index be3175c..6fc9167 100644
--- a/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj
+++ b/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj
@@ -97,7 +97,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_3D.lib;xsec_1D.lib;libeay32D.lib;ssleay32D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-c_3D.lib;xsec_1D.lib;$(SSLLibD);%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.user b/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.user
index 5a57229..2efd78c 100644
--- a/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.user
+++ b/Projects/vc10/xmltoolingtest/xmltoolingtest.vcxproj.user
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerEnvironment>PATH=$(BuildRoot)\x86-dbg\bin;$(BuildRoot)\$(xerces)\Build\Win32\VC10\debug;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(log4shib)\msvc10\Debug;;$(BuildRoot)\$(zlib)\debug;$(PATH)
+    <LocalDebuggerEnvironment>PATH=$(BuildRoot)\x86-dbg\bin;$(BuildRoot)\$(xerces)\Build\Win32\VC10\debug;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(log4shib)\msvc10\Debug;$(BuildRoot)\$(zlib)\debug;$(BuildRoot)\$(openssl)\out32dll.dbg\;$(PATH)
 XMLTOOLINGTEST_DATA=H:\Perforce\devel\cpp-xmltooling\xmltoolingtest\data
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\xmltoolingtest</LocalDebuggerWorkingDirectory>
     <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/xmltoolingtest/InlineKeyResolverTest.h b/xmltoolingtest/InlineKeyResolverTest.h
index baaa5b3..9a8bcd0 100644
--- a/xmltoolingtest/InlineKeyResolverTest.h
+++ b/xmltoolingtest/InlineKeyResolverTest.h
@@ -29,13 +29,15 @@
 #include <xmltooling/security/CredentialResolver.h>
 #include <xmltooling/signature/KeyInfo.h>
 
-
 #include <xsec/enc/XSECCryptoKey.hpp>
 
 #include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 extern "C" {
 #include <openssl/opensslv.h>
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#include <openssl/x509_vfy.h>
+#endif
 }
 
 // Force XMLSEC to assume OpenSSL
@@ -186,6 +188,7 @@ public:
         RSA* rsaCred = sslCred->getOpenSSLRSA();
         RSA* rsaKey = sslKey->getOpenSSLRSA();
 
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
         BIGNUM* n = rsaCred->n;
         BIGNUM* e = rsaCred->e;
         BIGNUM* d = rsaCred->d;
@@ -203,7 +206,15 @@ public:
         BIGNUM* kdmp1 = rsaKey->dmp1;
         BIGNUM* kdmq1 = rsaKey->dmq1;
         BIGNUM* kiqmp = rsaKey->iqmp;
-
+#else
+        const BIGNUM *n, *e, *d; RSA_get0_key(rsaCred, &n, &e, &d);
+        const BIGNUM *p, *q;  RSA_get0_factors(rsaCred, &p, &q);
+        const BIGNUM *dmp1, *dmq1, *iqmp; RSA_get0_crt_params(rsaCred, &dmp1, &dmq1, &iqmp);
+
+        const BIGNUM *kn, *ke, *kd; RSA_get0_key(rsaKey, &kn, &ke, &kd);
+        const BIGNUM *kp, *kq;  RSA_get0_factors(rsaKey, &kp, &kq);
+        const BIGNUM *kdmp1, *kdmq1, *kiqmp; RSA_get0_crt_params(rsaKey, &kdmp1, &kdmq1, &kiqmp);
+#endif
         TS_ASSERT(0 == BN_cmp(kn, n));
         TS_ASSERT(0 == BN_cmp(ke, e));
         TS_ASSERT(0 ==  BN_cmp(kd, d));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git