You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2017/08/25 18:42:18 UTC
svn commit: r1806212 - in /santuario/xml-security-cpp/trunk: ./
xsec/framework/ xsec/utils/ xsec/utils/unixutils/ xsec/utils/winutils/
Author: scantor
Date: Fri Aug 25 18:42:17 2017
New Revision: 1806212
URL: http://svn.apache.org/viewvc?rev=1806212&view=rev
Log:
Assume Xerces 3 - remove XSEC_XERCES_64BITSAFE
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in
santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.hpp
santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Fri Aug 25 18:42:17 2017
@@ -99,13 +99,14 @@ AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,A
AC_MSG_CHECKING([Xerces version])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
-[#if _XERCES_VERSION >= 20000
+[#if _XERCES_VERSION >= 30000
int i = 0;
#else
-#error cannot use version 1.x
+#error cannot use version 1.x or 2.x
#endif])],
[AC_MSG_RESULT(OK)],
- [AC_MSG_FAILURE([Xerces-C 2.x or 3.x is required])])
+ [AC_MSG_FAILURE([Xerces-C 3 is required])])
+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]], [[xercesc::XMLPlatformUtils::Initialize()]])],
[],[AC_MSG_ERROR([unable to link with Xerces])])
@@ -128,13 +129,6 @@ CXXFLAGS="${CXXFLAGS} -DXSEC_LIBRARY_BUI
# Find out some properties of the version of Xerces we have
-AC_MSG_CHECKING([whether Xerces is 64-bit clean])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/framework/MemBufInputSource.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
- XMLFilePos testvar;
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XERCES_64BITSAFE],[1],[Define to 1 if Xerces has a 64-bit-safe API.])],
- [AC_MSG_RESULT([no])])
-
AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/BinMemInputStream.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
XMLByte buf[1024];
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in Fri Aug 25 18:42:17 2017
@@ -45,9 +45,6 @@
/* Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport. */
#undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-/* Define to 1 if Xerces has a 64-bit-safe API. */
-#undef XSEC_XERCES_64BITSAFE
-
/* Define to 1 if Xerces DOMEntity has getInputEncoding. */
#undef XSEC_XERCES_DOMENTITYINPUTENCODING
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp Fri Aug 25 18:42:17 2017
@@ -63,11 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
// Define "sizes" of data to correspond to Xerces APIs
-#ifdef XSEC_XERCES_64BITSAFE
- typedef XMLSize_t xsecsize_t;
-#else
- typedef unsigned int xsecsize_t;
-#endif
+// TODO: just drop this out
+typedef XMLSize_t xsecsize_t;
// Pending API change, compile in a limit for Xerces SecurityManager entity expansion
#define XSEC_ENTITY_EXPANSION_LIMIT 1000
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=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Fri Aug 25 18:42:17 2017
@@ -54,10 +54,6 @@
# define XSEC_XERCES_DOMENTITYINPUTENCODING 1
-/* 3.0 now 64-bit safe */
-
-# define XSEC_XERCES_64BITSAFE 1
-
/* 3.0 InputStream must expose content type */
# define XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE 1
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp Fri Aug 25 18:42:17 2017
@@ -75,12 +75,7 @@ XSECBinTXFMInputStream::~XSECBinTXFMInpu
void XSECBinTXFMInputStream::reset(void) {}
-#ifdef XSEC_XERCES_64BITSAFE
-XMLFilePos
-#else
-unsigned int
-#endif
-XSECBinTXFMInputStream::curPos() const {
+XMLFilePos XSECBinTXFMInputStream::curPos() const {
return m_currentIndex;
}
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp Fri Aug 25 18:42:17 2017
@@ -112,11 +112,7 @@ public :
* @returns Bytes already returned.
*/
-#ifdef XSEC_XERCES_64BITSAFE
virtual XMLFilePos curPos() const;
-#else
- virtual unsigned int curPos() const;
-#endif
/**
* \brief Retrieve the required number of bytes and return
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp Fri Aug 25 18:42:17 2017
@@ -387,11 +387,7 @@ int safeBuffer::sbOffsetStrncmp(const ch
}
-#ifdef XSEC_XERCES_64BITSAFE
long safeBuffer::sbStrstr(const char * inStr) const {
-#else
-int safeBuffer::sbStrstr(const char * inStr) const {
-#endif
checkBufferType(BUFFER_CHAR);
char* p = strstr((char *) buffer, inStr);
@@ -407,11 +403,7 @@ int safeBuffer::sbStrstr(const char * in
}
-#ifdef XSEC_XERCES_64BITSAFE
long safeBuffer::sbStrstr(const XMLCh * inStr) const {
-#else
-int safeBuffer::sbStrstr(const XMLCh * inStr) const {
-#endif
checkBufferType(BUFFER_UNICODE);
XMLCh* p = XMLString::findAny((XMLCh *) buffer, inStr);
@@ -427,11 +419,7 @@ int safeBuffer::sbStrstr(const XMLCh * i
}
-#ifdef XSEC_XERCES_64BITSAFE
long safeBuffer::sbOffsetStrstr(const char * inStr, xsecsize_t offset) const {
-#else
-int safeBuffer::sbOffsetStrstr(const char * inStr, xsecsize_t offset) const {
-#endif
checkBufferType(BUFFER_CHAR);
xsecsize_t bl = (xsecsize_t) strlen((char *) buffer);
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.hpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.hpp Fri Aug 25 18:42:17 2017
@@ -108,17 +108,10 @@ public:
int sbStrcmp(const char * inStr) const;
int sbStrcmp(const safeBuffer & inStr) const;
-#ifdef XSEC_XERCES_64BITSAFE
long sbStrstr(const char * inStr) const;
long sbOffsetStrstr(const char * inStr, xsecsize_t offset) const;
// XMLCh versions
long sbStrstr(const XMLCh * inStr) const;
-#else
- int sbStrstr(const char * inStr) const;
- int sbOffsetStrstr(const char * inStr, xsecsize_t offset) const;
- // XMLCh versions
- int sbStrstr(const XMLCh * inStr) const;
-#endif
void sbStrinsIn(const XMLCh * inStr, xsecsize_t offset);
// XMLCh and char common functions
Modified: santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp Fri Aug 25 18:42:17 2017
@@ -69,11 +69,7 @@ public :
XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
~XSECBinHTTPURIInputStream();
-#ifdef XSEC_XERCES_64BITSAFE
XMLFilePos curPos() const;
-#else
- unsigned int curPos() const;
-#endif
xsecsize_t readBytes
(
XMLByte* const toFill
@@ -113,13 +109,7 @@ private :
};
-inline
-#ifdef XSEC_XERCES_64BITSAFE
-XMLFilePos
-#else
-unsigned int
-#endif
-XSECBinHTTPURIInputStream::curPos() const
+inline XMLFilePos XSECBinHTTPURIInputStream::curPos() const
{
return fBytesProcessed;
}
Modified: santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp?rev=1806212&r1=1806211&r2=1806212&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp Fri Aug 25 18:42:17 2017
@@ -85,11 +85,7 @@ public :
XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
~XSECBinHTTPURIInputStream();
-#ifdef XSEC_XERCES_64BITSAFE
XMLFilePos curPos() const;
-#else
- unsigned int curPos() const;
-#endif
xsecsize_t readBytes(XMLByte* const toFill, const xsecsize_t maxToRead);
#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
@@ -157,13 +153,7 @@ private :
};
-inline
-#ifdef XSEC_XERCES_64BITSAFE
-XMLFilePos
-#else
-unsigned int
-#endif
-XSECBinHTTPURIInputStream::curPos() const
+inline XMLFilePos XSECBinHTTPURIInputStream::curPos() const
{
return fBytesProcessed;
}