blautenb 2003/04/23 00:31:41
Modified: c/src/tools Makefile.in
c/src/tools/checksig checksig.cpp
c/src/tools/siginf siginf.cpp
c/src/tools/templatesign templatesign.cpp
c/src/tools/txfmout txfmout.cpp
Log:
Fixes from Scott Cantor and Derek Atkins
Revision Changes Path
1.2 +10 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2 Feb 2003 10:48:21 -0000 1.1
+++ Makefile.in 23 Apr 2003 07:31:39 -0000 1.2
@@ -99,7 +99,8 @@
${BINDIR}/c14n \
${BINDIR}/checksig \
${BINDIR}/templatesign \
- ${BINDIR}/txfmout
+ ${BINDIR}/txfmout \
+ ${BINDIR}/siginf
compile: ${OBJ_FILES}
@@ -142,6 +143,14 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/txfmout: ${OBJDIR}/txfmout${OBJSUFFIX}
+ $(LINK) $(LDFLAGS) $(LDXSEC) $< -o $@
+
+#============================= siginf =============================
+
+${OBJDIR}/siginf${OBJSUFFIX}: siginf/siginf.cpp
+ ${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
+
+${BINDIR}/siginf: ${OBJDIR}/siginf${OBJSUFFIX}
$(LINK) $(LDFLAGS) $(LDXSEC) $< -o $@
#============================= Clean =============================
1.15 +3 -3 xml-security/c/src/tools/checksig/checksig.cpp
Index: checksig.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/checksig.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- checksig.cpp 11 Apr 2003 12:25:49 -0000 1.14
+++ checksig.cpp 23 Apr 2003 07:31:40 -0000 1.15
@@ -157,7 +157,7 @@
#ifdef XSEC_NO_XALAN
-ostream& operator<< (ostream& target, const XMLCh * s)
+std::ostream& operator<< (std::ostream& target, const XMLCh * s)
{
char *p = XMLString::transcode(s);
target << p;
@@ -467,7 +467,7 @@
strcat(baseURI, filename);
// Find any ':' and "\" characters
- int lastSlash;
+ int lastSlash = 0;
for (unsigned int i = 8; i < strlen(baseURI); ++i) {
if (baseURI[i] == '\\') {
lastSlash = i;
1.2 +2 -18 xml-security/c/src/tools/siginf/siginf.cpp
Index: siginf.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/siginf/siginf.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- siginf.cpp 22 Apr 2003 22:35:18 -0000 1.1
+++ siginf.cpp 23 Apr 2003 07:31:41 -0000 1.2
@@ -133,21 +133,6 @@
#endif
-#if defined (HAVE_OPENSSL)
-// OpenSSL
-
-# include <xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp>
-# include <openssl/err.h>
-
-#endif
-
-#if defined (HAVE_WINCAPI)
-
-# include <xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp>
-# include <xsec/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp>
-
-#endif
-
#ifdef XSEC_NO_XALAN
ostream& operator<< (ostream& target, const XMLCh * s)
@@ -280,7 +265,6 @@
case (TRANSFORM_XSLT) :
{
- DSIGTransformXSL *xslt = (DSIGTransformXSL *) t;
cout << "XSLT" << endl;
// Really should serialise and output stylesheet.
@@ -545,7 +529,7 @@
catch (XSECException &e) {
char * msg = XMLString::transcode(e.getMsg());
- cerr << "An error occured during signature verification\n
Message: "
+ cerr << "An error occured during signature loading\n Message:
"
<< msg << endl;
delete [] msg;
errorsOccured = true;
1.7 +4 -4 xml-security/c/src/tools/templatesign/templatesign.cpp
Index: templatesign.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/templatesign/templatesign.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- templatesign.cpp 11 Apr 2003 12:25:49 -0000 1.6
+++ templatesign.cpp 23 Apr 2003 07:31:41 -0000 1.7
@@ -121,14 +121,14 @@
XALAN_USING_XALAN(XPathEvaluator)
XALAN_USING_XALAN(XalanTransformer)
+#endif
+
using std::ostream;
using std::cout;
using std::cerr;
using std::endl;
using std::flush;
-#endif
-
// Uplift entire program into Xerces namespace
XERCES_CPP_NAMESPACE_USE
@@ -1171,7 +1171,7 @@
cout << doc;
delete [] gEncodingName;
- delete [] (void *) encNameStr;
+ delete [] (XMLCh *) encNameStr; // Cast to allow delete[] const
delete formatTarget;
#if defined (_WIN32)
1.9 +3 -3 xml-security/c/src/tools/txfmout/txfmout.cpp
Index: txfmout.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/txfmout/txfmout.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- txfmout.cpp 11 Apr 2003 12:25:49 -0000 1.8
+++ txfmout.cpp 23 Apr 2003 07:31:41 -0000 1.9
@@ -141,7 +141,7 @@
#ifdef XSEC_NO_XALAN
-ostream& operator<< (ostream& target, const XMLCh * s)
+std::ostream& operator<< (std::ostream& target, const XMLCh * s)
{
char *p = XMLString::transcode(s);
target << p;
@@ -558,7 +558,7 @@
strcat(baseURI, filename);
// Find any ':' and "\" characters
- int lastSlash;
+ int lastSlash = 0;
for (unsigned int i = 8; i < strlen(baseURI); ++i) {
if (baseURI[i] == '\\') {
lastSlash = i;
