You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2016/04/16 03:42:51 UTC

svn commit: r1739392 - in /santuario/xml-security-cpp/trunk/xsec: framework/XSECW32Config.hpp tools/xtest/xtest.cpp

Author: blautenb
Date: Sat Apr 16 01:42:51 2016
New Revision: 1739392

URL: http://svn.apache.org/viewvc?rev=1739392&view=rev
Log:
Clean compile and run without OpenSSL on Windows

Modified:
    santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
    santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp

Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp?rev=1739392&r1=1739391&r2=1739392&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Sat Apr 16 01:42:51 2016
@@ -164,7 +164,7 @@
  * Define presence of cryptographic providers
  */
 
-#define XSEC_HAVE_OPENSSL 1
+// #define XSEC_HAVE_OPENSSL 1
 
 #define XSEC_HAVE_WINCAPI 1
 

Modified: santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp?rev=1739392&r1=1739391&r2=1739392&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp Sat Apr 16 01:42:51 2016
@@ -2547,6 +2547,13 @@ int main(int argc, char **argv) {
 	bool		doSignatureUnitTests = true;
 	bool		doXKMSTest = true;
 
+	// Testing for which Crypto API to use by default - only really useful on windows
+#if !defined(XSEC_HAVE_OPENSSL)
+#if defined(XSEC_HAVE_WINCAPI)
+	g_useWinCAPI = true;
+#endif
+#endif
+
 	int paramCount = 1;
 
 	while (paramCount < argc) {