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 2003/10/20 13:05:37 UTC
cvs commit: xml-security/c/src/tools/cipher MerlinFiveInteropResolver.cpp
blautenb 2003/10/20 04:05:37
Modified: c/src/tools/cipher MerlinFiveInteropResolver.cpp
Log:
Fix bug with *NIX compile
Revision Changes Path
1.5 +7 -3 xml-security/c/src/tools/cipher/MerlinFiveInteropResolver.cpp
Index: MerlinFiveInteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/MerlinFiveInteropResolver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MerlinFiveInteropResolver.cpp 19 Oct 2003 11:00:27 -0000 1.4
+++ MerlinFiveInteropResolver.cpp 20 Oct 2003 11:05:37 -0000 1.5
@@ -76,8 +76,6 @@
#include <xsec/dsig/DSIGKeyInfoName.hpp>
#include <xsec/dsig/DSIGKeyInfoX509.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp>
-#include <xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp>
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
@@ -94,7 +92,13 @@
# include <openssl/pem.h>
# include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>
# include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>
+# include <xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp>
#endif
+
+#if defined (HAVE_WINCAPI)
+# include <xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp>
+#endif
+
// --------------------------------------------------------------------------------
// Strings and keys