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/31 18:19:32 UTC
svn commit: r1806835 - in /santuario/xml-security-cpp/trunk: configure.ac
xsec/dsig/DSIGConstants.cpp xsec/framework/XSECConfig.hpp.in
xsec/framework/XSECDefs.hpp xsec/framework/XSECW32Config.hpp
Author: scantor
Date: Thu Aug 31 18:19:32 2017
New Revision: 1806835
URL: http://svn.apache.org/viewvc?rev=1806835&view=rev
Log:
Assume Xerces 3 - remove XSEC_XERCES_XMLSTRING_HAS_RELEASE
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp
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
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806835&r1=1806834&r2=1806835&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Thu Aug 31 18:19:32 2017
@@ -127,16 +127,6 @@ fi
CFLAGS="${CFLAGS} -DXSEC_LIBRARY_BUILD"
CXXFLAGS="${CXXFLAGS} -DXSEC_LIBRARY_BUILD"
-# Find out some properties of the version of Xerces we have
-
-AC_MSG_CHECKING([whether Xerces XMLString has ::release])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/XMLString.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
- XMLCh * tst;
- XMLString::release(&tst);
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XERCES_XMLSTRING_HAS_RELEASE],[1],[Define to 1 if Xerces XMLString has release method.])],
- [AC_MSG_RESULT([no])])
-
# Now check for Xalan
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp?rev=1806835&r1=1806834&r2=1806835&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp Thu Aug 31 18:19:32 2017
@@ -39,11 +39,7 @@ XERCES_CPP_NAMESPACE_USE
#undef XSEC_RELEASE_XMLCH
-#if defined (XSEC_XERCES_XMLSTRING_HAS_RELEASE)
-# define XSEC_RELEASE_XMLCH(x) XMLString::release((XMLCh **) &x)
-#else
-# define XSEC_RELEASE_XMLCH(x) delete[] x;
-#endif
+#define XSEC_RELEASE_XMLCH(x) XMLString::release((XMLCh **) &x)
// --------------------------------------------------------------------------------
// Some useful defines
@@ -259,15 +255,15 @@ void DSIGConstants::create() {
s_unicodeStrURIRawX509 = XMLString::transcode(URI_ID_RAWX509);
s_unicodeStrURIDSIG = XMLString::transcode(URI_ID_DSIG);
- s_unicodeStrURIDSIG11 = XMLString::transcode(URI_ID_DSIG11);
+ s_unicodeStrURIDSIG11 = XMLString::transcode(URI_ID_DSIG11);
s_unicodeStrURIEC = XMLString::transcode(URI_ID_EC);
s_unicodeStrURIXPF = XMLString::transcode(URI_ID_XPF);
s_unicodeStrURIXENC = XMLString::transcode(URI_ID_XENC);
- s_unicodeStrURIXENC11 = XMLString::transcode(URI_ID_XENC11);
+ s_unicodeStrURIXENC11 = XMLString::transcode(URI_ID_XENC11);
s_unicodeStrURISIGBASE = XMLString::transcode(URI_ID_SIG_BASE);
s_unicodeStrURISIGBASEMORE = XMLString::transcode(URI_ID_SIG_BASEMORE);
- s_unicodeStrURISIGBASE11 = XMLString::transcode(URI_ID_SIG_BASE11);
+ s_unicodeStrURISIGBASE11 = XMLString::transcode(URI_ID_SIG_BASE11);
s_unicodeStrURISHA1 = XMLString::transcode(URI_ID_SHA1);
s_unicodeStrURISHA224 = XMLString::transcode(URI_ID_SHA224);
@@ -281,13 +277,13 @@ void DSIGConstants::create() {
s_unicodeStrURIENVELOPE = XMLString::transcode(URI_ID_ENVELOPE);
s_unicodeStrURIC14N_NOC = XMLString::transcode(URI_ID_C14N_NOC);
s_unicodeStrURIC14N_COM = XMLString::transcode(URI_ID_C14N_COM);
- s_unicodeStrURIC14N11_NOC = XMLString::transcode(URI_ID_C14N11_NOC);
- s_unicodeStrURIC14N11_COM = XMLString::transcode(URI_ID_C14N11_COM);
+ s_unicodeStrURIC14N11_NOC = XMLString::transcode(URI_ID_C14N11_NOC);
+ s_unicodeStrURIC14N11_COM = XMLString::transcode(URI_ID_C14N11_COM);
s_unicodeStrURIEXC_C14N_NOC = XMLString::transcode(URI_ID_EXC_C14N_NOC);
s_unicodeStrURIEXC_C14N_COM = XMLString::transcode(URI_ID_EXC_C14N_COM);
s_unicodeStrURIDSA_SHA1 = XMLString::transcode(URI_ID_DSA_SHA1);
- s_unicodeStrURIDSA_SHA256 = XMLString::transcode(URI_ID_DSA_SHA256);
+ s_unicodeStrURIDSA_SHA256 = XMLString::transcode(URI_ID_DSA_SHA256);
s_unicodeStrURIRSA_MD5 = XMLString::transcode(URI_ID_RSA_MD5);
s_unicodeStrURIRSA_SHA1 = XMLString::transcode(URI_ID_RSA_SHA1);
@@ -297,7 +293,7 @@ void DSIGConstants::create() {
s_unicodeStrURIRSA_SHA512 = XMLString::transcode(URI_ID_RSA_SHA512);
s_unicodeStrURIECDSA_SHA1 = XMLString::transcode(URI_ID_ECDSA_SHA1);
- s_unicodeStrURIECDSA_SHA224 = XMLString::transcode(URI_ID_ECDSA_SHA224);
+ s_unicodeStrURIECDSA_SHA224 = XMLString::transcode(URI_ID_ECDSA_SHA224);
s_unicodeStrURIECDSA_SHA256 = XMLString::transcode(URI_ID_ECDSA_SHA256);
s_unicodeStrURIECDSA_SHA384 = XMLString::transcode(URI_ID_ECDSA_SHA384);
s_unicodeStrURIECDSA_SHA512 = XMLString::transcode(URI_ID_ECDSA_SHA512);
@@ -316,20 +312,20 @@ void DSIGConstants::create() {
s_unicodeStrURIAES192_CBC = XMLString::transcode(URI_ID_AES192_CBC);
s_unicodeStrURIAES256_CBC = XMLString::transcode(URI_ID_AES256_CBC);
s_unicodeStrURIAES128_GCM = XMLString::transcode(URI_ID_AES128_GCM);
- s_unicodeStrURIAES192_GCM = XMLString::transcode(URI_ID_AES192_GCM);
- s_unicodeStrURIAES256_GCM = XMLString::transcode(URI_ID_AES256_GCM);
+ s_unicodeStrURIAES192_GCM = XMLString::transcode(URI_ID_AES192_GCM);
+ s_unicodeStrURIAES256_GCM = XMLString::transcode(URI_ID_AES256_GCM);
s_unicodeStrURIKW_3DES = XMLString::transcode(URI_ID_KW_3DES);
- s_unicodeStrURIKW_AES128 = XMLString::transcode(URI_ID_KW_AES128);
+ s_unicodeStrURIKW_AES128 = XMLString::transcode(URI_ID_KW_AES128);
s_unicodeStrURIKW_AES192 = XMLString::transcode(URI_ID_KW_AES192);
s_unicodeStrURIKW_AES256 = XMLString::transcode(URI_ID_KW_AES256);
- s_unicodeStrURIKW_AES128_PAD = XMLString::transcode(URI_ID_KW_AES128_PAD);
+ s_unicodeStrURIKW_AES128_PAD = XMLString::transcode(URI_ID_KW_AES128_PAD);
s_unicodeStrURIKW_AES192_PAD = XMLString::transcode(URI_ID_KW_AES192_PAD);
s_unicodeStrURIKW_AES256_PAD = XMLString::transcode(URI_ID_KW_AES256_PAD);
s_unicodeStrURIRSA_1_5 = XMLString::transcode(URI_ID_RSA_1_5);
s_unicodeStrURIRSA_OAEP_MGFP1 = XMLString::transcode(URI_ID_RSA_OAEP_MGFP1);
- s_unicodeStrURIRSA_OAEP = XMLString::transcode(URI_ID_RSA_OAEP);
+ s_unicodeStrURIRSA_OAEP = XMLString::transcode(URI_ID_RSA_OAEP);
- s_unicodeStrURIMGF1_BASE = XMLString::transcode(URI_ID_MGF1_BASE);
+ s_unicodeStrURIMGF1_BASE = XMLString::transcode(URI_ID_MGF1_BASE);
s_unicodeStrURIMGF1_SHA1 = XMLString::transcode(URI_ID_MGF1_SHA1);
s_unicodeStrURIMGF1_SHA224 = XMLString::transcode(URI_ID_MGF1_SHA224);
s_unicodeStrURIMGF1_SHA256 = XMLString::transcode(URI_ID_MGF1_SHA256);
@@ -341,7 +337,7 @@ void DSIGConstants::create() {
s_unicodeStrPROVOpenSSL = XMLString::transcode(PROV_OPENSSL);
s_unicodeStrPROVWinCAPI = XMLString::transcode(PROV_WINCAPI);
- s_unicodeStrPROVNSS = XMLString::transcode(PROV_NSS);
+ s_unicodeStrPROVNSS = XMLString::transcode(PROV_NSS);
}
@@ -357,15 +353,15 @@ void DSIGConstants::destroy() {
XSEC_RELEASE_XMLCH(s_unicodeStrURIRawX509);
XSEC_RELEASE_XMLCH(s_unicodeStrURIDSIG);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIDSIG11);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIDSIG11);
XSEC_RELEASE_XMLCH(s_unicodeStrURIEC);
XSEC_RELEASE_XMLCH(s_unicodeStrURIXPF);
XSEC_RELEASE_XMLCH(s_unicodeStrURIXENC);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIXENC11);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIXENC11);
XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASE);
XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASEMORE);
- XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASE11);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASE11);
XSEC_RELEASE_XMLCH(s_unicodeStrURISHA1);
XSEC_RELEASE_XMLCH(s_unicodeStrURISHA224);
@@ -379,12 +375,12 @@ void DSIGConstants::destroy() {
XSEC_RELEASE_XMLCH(s_unicodeStrURIENVELOPE);
XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N_NOC);
XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N_COM);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N11_NOC);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N11_COM);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N11_NOC);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIC14N11_COM);
XSEC_RELEASE_XMLCH(s_unicodeStrURIEXC_C14N_NOC);
XSEC_RELEASE_XMLCH(s_unicodeStrURIEXC_C14N_COM);
XSEC_RELEASE_XMLCH(s_unicodeStrURIDSA_SHA1);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIDSA_SHA256);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIDSA_SHA256);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_MD5);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_SHA1);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_SHA224);
@@ -392,7 +388,7 @@ void DSIGConstants::destroy() {
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_SHA384);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_SHA512);
XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA1);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA224);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA224);
XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA256);
XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA384);
XSEC_RELEASE_XMLCH(s_unicodeStrURIECDSA_SHA512);
@@ -420,9 +416,9 @@ void DSIGConstants::destroy() {
XSEC_RELEASE_XMLCH(s_unicodeStrURIKW_AES256_PAD);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_1_5);
XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_OAEP_MGFP1);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_OAEP);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIRSA_OAEP);
- XSEC_RELEASE_XMLCH(s_unicodeStrURIMGF1_BASE);
+ XSEC_RELEASE_XMLCH(s_unicodeStrURIMGF1_BASE);
XSEC_RELEASE_XMLCH(s_unicodeStrURIMGF1_SHA1);
XSEC_RELEASE_XMLCH(s_unicodeStrURIMGF1_SHA224);
XSEC_RELEASE_XMLCH(s_unicodeStrURIMGF1_SHA256);
@@ -674,4 +670,4 @@ bool XSECmapURIToMaskGenerationFunc(cons
mgf = MGF_NONE;
return false;
-}
\ No newline at end of file
+}
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=1806835&r1=1806834&r2=1806835&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in Thu Aug 31 18:19:32 2017
@@ -45,9 +45,6 @@
/* Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport. */
#undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-/* Define to 1 if Xerces XMLString has release method. */
-#undef XSEC_XERCES_XMLSTRING_HAS_RELEASE
-
/* Define to 1 if Xalan XSLException returns XalanDOMString. */
#undef XSEC_XSLEXCEPTION_RETURNS_DOMSTRING
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=1806835&r1=1806834&r2=1806835&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp Thu Aug 31 18:19:32 2017
@@ -90,11 +90,7 @@ typedef XMLSize_t xsecsize_t;
# define XSEC_DECLARE_XERCES_STRUCT(NAME) struct NAME;
#endif
-#if defined (XSEC_XERCES_XMLSTRING_HAS_RELEASE)
-# define XSEC_RELEASE_XMLCH(x) XMLString::release(&(x))
-#else
-# define XSEC_RELEASE_XMLCH(x) delete[] (x);
-#endif
+#define XSEC_RELEASE_XMLCH(x) XMLString::release(&(x))
// --------------------------------------------------------------------------------
// Project Library Handling
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=1806835&r1=1806834&r2=1806835&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Thu Aug 31 18:19:32 2017
@@ -30,22 +30,6 @@
*
*/
-#include <xercesc/util/XercesVersion.hpp>
-
-/*
- * Because we don't have a configure script, we need to rely on version
- * numbers to understand library idiosycracies
- */
-
-#if (XERCES_VERSION_MAJOR == 3) || ((XERCES_VERSION_MAJOR == 2) && (XERCES_VERSION_MINOR >= 3))
-
-/* Does XMLString::release() exist */
-
-# define XSEC_XERCES_XMLSTRING_HAS_RELEASE 1
-
-#endif
-
-
/*
* The following defines whether Xalan integration is required.