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/04/24 02:06:21 UTC
cvs commit: xml-security/c/src/utils XSECSafeBuffer.cpp XSECSafeBuffer.hpp
blautenb 2003/04/23 17:06:20
Modified: c/Projects/VC6.0/xsec/siginf siginf.dsp
c/src/dsig DSIGConstants.hpp DSIGSignedInfo.hpp
c/src/tools/siginf siginf.cpp
c/src/utils XSECSafeBuffer.cpp XSECSafeBuffer.hpp
Log:
Minor fixes
Revision Changes Path
1.2 +9 -9 xml-security/c/Projects/VC6.0/xsec/siginf/siginf.dsp
Index: siginf.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/siginf/siginf.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- siginf.dsp 22 Apr 2003 22:35:17 -0000 1.1
+++ siginf.dsp 24 Apr 2003 00:06:20 -0000 1.2
@@ -51,8 +51,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "siginf - Win32 Debug"
@@ -67,15 +67,15 @@
# PROP Intermediate_Dir "../../../../Build/Win32/VC6/Debug/obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 ../../../../Build/Win32/VC6/Debug/xsec_lib_01D.lib libeay32.lib xerces-c_2D.lib Xalan-C_1D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "siginf - Win32 Debug No Xalan"
@@ -92,8 +92,8 @@
# PROP Intermediate_Dir "../../../../Build/Win32/VC6/Debug/obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -125,8 +125,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib xerces-c_2.lib Xalan-C_1.lib /nologo /subsystem:console /machine:I386
!ENDIF
1.7 +2 -2 xml-security/c/src/dsig/DSIGConstants.hpp
Index: DSIGConstants.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGConstants.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGConstants.hpp 17 Apr 2003 09:38:36 -0000 1.6
+++ DSIGConstants.hpp 24 Apr 2003 00:06:20 -0000 1.7
@@ -149,7 +149,7 @@
HASH_NONE = 0, // No method defined
HASH_SHA1 = 1, // SHA1
- HASH_MD5 = 2,
+ HASH_MD5 = 2
};
enum transformType {
1.6 +2 -2 xml-security/c/src/dsig/DSIGSignedInfo.hpp
Index: DSIGSignedInfo.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignedInfo.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGSignedInfo.hpp 2 Mar 2003 08:21:01 -0000 1.5
+++ DSIGSignedInfo.hpp 24 Apr 2003 00:06:20 -0000 1.6
@@ -105,7 +105,7 @@
*
*/
-class DSIGSignedInfo {
+class DSIG_EXPORT DSIGSignedInfo {
public:
1.3 +12 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- siginf.cpp 23 Apr 2003 07:31:41 -0000 1.2
+++ siginf.cpp 24 Apr 2003 00:06:20 -0000 1.3
@@ -324,7 +324,7 @@
}
-void outputSignatureInfo(DSIGSignature *sig) {
+void outputSignatureInfo(DSIGSignature *sig, bool skipReferences) {
// First get some information about the main signature
cout << "Signature (Signed Info) settings : " << endl;
@@ -393,15 +393,17 @@
// Read in the references and output
- DSIGReferenceList * rl = sig->getReferenceList();
+ if (skipReferences == false) {
+
+ DSIGReferenceList * rl = sig->getReferenceList();
- if (rl != NULL) {
+ if (rl != NULL) {
- cout << endl << "Reference List : " << endl;
- outputReferences(rl, 1);
+ cout << endl << "Reference List : " << endl;
+ outputReferences(rl, 1);
+ }
}
-
}
void printUsage(void) {
@@ -520,7 +522,7 @@
cout << "Filename : " << filename << endl;
- outputSignatureInfo(sig);
+ outputSignatureInfo(sig, skipRefs);
// if (skipRefs == false)
// result = sig->verifySignatureOnly();
// else
@@ -558,7 +560,8 @@
/* We output a version number to overcome a "feature" in Microsoft's memory
leak detection */
- cout << "DSIG Info (Using Apache XML-Security-C Library v" << XSEC_VERSION << ")\n";
+ cout << "DSIG Info (Using Apache XML-Security-C Library v" << XSEC_VERSION_MAJOR <<
+ "." << XSEC_VERSION_MEDIUM << "." << XSEC_VERSION_MINOR << ")\n";
#if defined (_DEBUG) && defined (_MSC_VER)
1.5 +11 -11 xml-security/c/src/utils/XSECSafeBuffer.cpp
Index: XSECSafeBuffer.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBuffer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECSafeBuffer.cpp 7 Apr 2003 12:27:13 -0000 1.4
+++ XSECSafeBuffer.cpp 24 Apr 2003 00:06:20 -0000 1.5
@@ -145,7 +145,7 @@
}
-safeBuffer::safeBuffer(char * inStr, unsigned int initialSize) {
+safeBuffer::safeBuffer(const char * inStr, unsigned int initialSize) {
// Initialise with a string
@@ -218,7 +218,7 @@
}
-void safeBuffer::sbStrncpyIn(char * inStr, int n) {
+void safeBuffer::sbStrncpyIn(const char * inStr, int n) {
int len = strlen(inStr);
checkAndExpand((n < len) ? n : len);
@@ -239,7 +239,7 @@
}
-void safeBuffer::sbStrcatIn(char * inStr) {
+void safeBuffer::sbStrcatIn(const char * inStr) {
checkBufferType(BUFFER_CHAR);
checkAndExpand(strlen((char *) buffer) + strlen(inStr));
@@ -255,7 +255,7 @@
}
-void safeBuffer::sbStrncatIn(char * inStr, int n) {
+void safeBuffer::sbStrncatIn(const char * inStr, int n) {
checkBufferType(BUFFER_CHAR);
@@ -322,14 +322,14 @@
// Comparisons
-int safeBuffer::sbStrncmp(char *inStr, int n) {
+int safeBuffer::sbStrncmp(const char *inStr, int n) const {
checkBufferType(BUFFER_CHAR);
return (strncmp((char *) buffer, inStr, n));
}
-int safeBuffer::sbStrcmp(char *inStr) const {
+int safeBuffer::sbStrcmp(const char *inStr) const {
checkBufferType(BUFFER_CHAR);
return (strcmp((char *) buffer, inStr));
@@ -343,7 +343,7 @@
}
-int safeBuffer::sbOffsetStrcmp(char * inStr, unsigned int offset) {
+int safeBuffer::sbOffsetStrcmp(const char * inStr, unsigned int offset) const {
checkBufferType(BUFFER_CHAR);
unsigned int bl = strlen((char *) buffer);
@@ -355,7 +355,7 @@
}
-int safeBuffer::sbOffsetStrncmp(char * inStr, unsigned int offset, int n) {
+int safeBuffer::sbOffsetStrncmp(const char * inStr, unsigned int offset, int n) const {
checkBufferType(BUFFER_CHAR);
unsigned int bl = strlen((char *) buffer);
@@ -366,7 +366,7 @@
}
-int safeBuffer::sbStrstr(char * inStr) {
+int safeBuffer::sbStrstr(const char * inStr) const {
char * p;
int d;
@@ -386,7 +386,7 @@
}
-int safeBuffer::sbOffsetStrstr(const char * inStr, unsigned int offset) {
+int safeBuffer::sbOffsetStrstr(const char * inStr, unsigned int offset) const {
char * p;
int d;
1.7 +11 -11 xml-security/c/src/utils/XSECSafeBuffer.hpp
Index: XSECSafeBuffer.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBuffer.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECSafeBuffer.hpp 7 Apr 2003 12:27:13 -0000 1.6
+++ XSECSafeBuffer.hpp 24 Apr 2003 00:06:20 -0000 1.7
@@ -114,7 +114,7 @@
safeBuffer();
safeBuffer(int initialSize);
- safeBuffer(char * inStr, unsigned int initialSize = DEFAULT_SAFE_BUFFER_SIZE);
+ safeBuffer(const char * inStr, unsigned int initialSize = DEFAULT_SAFE_BUFFER_SIZE);
safeBuffer(const safeBuffer & other);
~safeBuffer();
@@ -125,11 +125,11 @@
void sbStrcpyIn(const char * inStr);
void sbStrcpyIn(const safeBuffer & inStr);
- void sbStrncpyIn(char * inStr, int n);
+ void sbStrncpyIn(const char * inStr, int n);
void sbStrncpyIn(const safeBuffer & inStr, int n);
- void sbStrcatIn(char * inStr);
+ void sbStrcatIn(const char * inStr);
void sbStrcatIn(const safeBuffer & inStr);
- void sbStrncatIn(char * inStr, int n);
+ void sbStrncatIn(const char * inStr, int n);
void sbStrinsIn(const char * inStr, unsigned int offset);
void sbMemcpyIn(const void * inBuf, int n);
@@ -140,13 +140,13 @@
// Comparison functions
- int sbStrncmp(char * inStr, int n);
- int sbOffsetStrcmp(char * inStr, unsigned int offset);
- int sbOffsetStrncmp(char * inStr, unsigned int offset, int n);
- int sbStrcmp(char * inStr) const;
+ int sbStrncmp(const char * inStr, int n) const;
+ int sbOffsetStrcmp(const char * inStr, unsigned int offset) const;
+ int sbOffsetStrncmp(const char * inStr, unsigned int offset, int n) const;
+ int sbStrcmp(const char * inStr) const;
int sbStrcmp(const safeBuffer & inStr) const;
- int sbStrstr(char * inStr);
- int sbOffsetStrstr(const char * inStr, unsigned int offset);
+ int sbStrstr(const char * inStr) const;
+ int sbOffsetStrstr(const char * inStr, unsigned int offset) const;
// Operators