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/09/15 14:12:09 UTC
cvs commit: xml-security/c/src/tools/checksig InteropResolver.cpp InteropResolver.hpp
blautenb 2003/09/15 05:12:09
Modified: c/src/framework XSECEnv.cpp
c/src/tools Makefile.in
c/src/tools/checksig InteropResolver.cpp InteropResolver.hpp
Log:
Fix recent updates to compile under Linux
Revision Changes Path
1.3 +2 -2 xml-security/c/src/framework/XSECEnv.cpp
Index: XSECEnv.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECEnv.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECEnv.cpp 15 Sep 2003 11:48:39 -0000 1.2
+++ XSECEnv.cpp 15 Sep 2003 12:12:09 -0000 1.3
@@ -70,7 +70,7 @@
// XSEC Includes
#include <xsec/framework/XSECEnv.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECUriResolver.hpp>
+#include <xsec/framework/XSECURIResolver.hpp>
#include <xsec/dsig/DSIGConstants.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
1.7 +5 -2 xml-security/c/src/tools/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 7 Sep 2003 00:52:26 -0000 1.6
+++ Makefile.in 15 Sep 2003 12:12:09 -0000 1.7
@@ -166,8 +166,11 @@
${OBJDIR}/cipher${OBJSUFFIX}: cipher/cipher.cpp
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o ${@} $<
-${BINDIR}/cipher: ${OBJDIR}/cipher${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
+${OBJDIR}/MerlinFiveInteropResolver${OBJSUFFIX}: cipher/MerlinFiveInteropResolver.cpp
+ ${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o ${@} $<
+
+${BINDIR}/cipher: ${OBJDIR}/cipher${OBJSUFFIX} ${OBJDIR}/MerlinFiveInteropResolver${OBJSUFFIX}
+ $(LINK) $(LDFLAGS) $^ $(LDXSEC) $(LIBS) -o $@
#============================= Clean =============================
1.7 +2 -2 xml-security/c/src/tools/checksig/InteropResolver.cpp
Index: InteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InteropResolver.cpp 11 Sep 2003 11:11:55 -0000 1.6
+++ InteropResolver.cpp 15 Sep 2003 12:12:09 -0000 1.7
@@ -682,7 +682,7 @@
-XSECKeyInfoResolver * InteropResolver::clone(void) {
+XSECKeyInfoResolver * InteropResolver::clone(void) const {
return new InteropResolver(mp_baseURI);
1.6 +2 -2 xml-security/c/src/tools/checksig/InteropResolver.hpp
Index: InteropResolver.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropResolver.hpp 5 Jul 2003 10:30:35 -0000 1.5
+++ InteropResolver.hpp 15 Sep 2003 12:12:09 -0000 1.6
@@ -93,7 +93,7 @@
// Interface functions
virtual XSECCryptoKey * resolveKey(DSIGKeyInfoList * lst);
- virtual XSECKeyInfoResolver * clone(void);
+ virtual XSECKeyInfoResolver * clone(void) const;
// Internal functions
X509 * nextFile2Cert(void);