blautenb 2003/05/19 05:31:00
Modified: c/src/dsig DSIGConstants.cpp DSIGConstants.hpp
c/src/framework XSECDefs.hpp
c/src/utils/unixutils XSECBinHTTPURIInputStream.cpp
Log:
Cleaned up constants so can compile under INTEL compiler
Revision Changes Path
1.8 +85 -118 xml-security/c/src/dsig/DSIGConstants.cpp
Index: DSIGConstants.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGConstants.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSIGConstants.cpp 18 May 2003 11:00:01 -0000 1.7
+++ DSIGConstants.cpp 19 May 2003 12:30:59 -0000 1.8
@@ -70,107 +70,74 @@
#include <xsec/dsig/DSIGConstants.hpp>
//
--------------------------------------------------------------------------------
-// Actual strings
+// Constant Strings Storage
//
--------------------------------------------------------------------------------
-static XMLCh * s_unicodeStrEmpty;
-static XMLCh * s_unicodeStrNL;
-static XMLCh * s_unicodeStrXmlns;
-
-static XMLCh * s_unicodeStrAlgorithm;
-
-static XMLCh * s_unicodeStrURIDSIG;
-static XMLCh * s_unicodeStrURIEC;
-static XMLCh * s_unicodeStrURIXPF;
-static XMLCh * s_unicodeStrURISHA1;
-static XMLCh * s_unicodeStrURIMD5;
-static XMLCh * s_unicodeStrURIBASE64;
-static XMLCh * s_unicodeStrURIXPATH;
-static XMLCh * s_unicodeStrURIXSLT;
-static XMLCh * s_unicodeStrURIENVELOPE;
-static XMLCh * s_unicodeStrURIC14N_NOC;
-static XMLCh * s_unicodeStrURIC14N_COM;
-static XMLCh * s_unicodeStrURIEXC_C14N_NOC;
-static XMLCh * s_unicodeStrURIEXC_C14N_COM;
-static XMLCh * s_unicodeStrURIDSA_SHA1;
-static XMLCh * s_unicodeStrURIRSA_SHA1;
-static XMLCh * s_unicodeStrURIHMAC_SHA1;
-static XMLCh * s_unicodeStrURIXMLNS;
-static XMLCh * s_unicodeStrURIMANIFEST;
-static XMLCh * s_unicodeStrPROVOpenSSL;
-static XMLCh * s_unicodeStrPROVWinCAPI;
-static XMLCh * s_unicodeStrURIRawX509;
+const XMLCh * DSIGConstants::s_unicodeStrEmpty; // ""
+const XMLCh * DSIGConstants::s_unicodeStrNL; // "\n"
+const XMLCh * DSIGConstants::s_unicodeStrXmlns; // "xmlns"
+
+const XMLCh * DSIGConstants::s_unicodeStrAlgorithm;
+
+const XMLCh * DSIGConstants::s_unicodeStrURIDSIG;
+const XMLCh * DSIGConstants::s_unicodeStrURIEC;
+const XMLCh * DSIGConstants::s_unicodeStrURIXPF;
+
+const XMLCh * DSIGConstants::s_unicodeStrURIRawX509;
+const XMLCh * DSIGConstants::s_unicodeStrURISHA1;
+const XMLCh * DSIGConstants::s_unicodeStrURIMD5; // Not
recommended
+const XMLCh * DSIGConstants::s_unicodeStrURIBASE64;
+const XMLCh * DSIGConstants::s_unicodeStrURIXPATH;
+const XMLCh * DSIGConstants::s_unicodeStrURIXSLT;
+const XMLCh * DSIGConstants::s_unicodeStrURIENVELOPE;
+const XMLCh * DSIGConstants::s_unicodeStrURIC14N_NOC;
+const XMLCh * DSIGConstants::s_unicodeStrURIC14N_COM;
+const XMLCh * DSIGConstants::s_unicodeStrURIEXC_C14N_NOC;
+const XMLCh * DSIGConstants::s_unicodeStrURIEXC_C14N_COM;
+const XMLCh * DSIGConstants::s_unicodeStrURIDSA_SHA1;
+const XMLCh * DSIGConstants::s_unicodeStrURIRSA_SHA1;
+const XMLCh * DSIGConstants::s_unicodeStrURIHMAC_SHA1;
+const XMLCh * DSIGConstants::s_unicodeStrURIXMLNS;
+const XMLCh * DSIGConstants::s_unicodeStrURIMANIFEST;
+const XMLCh * DSIGConstants::s_unicodeStrPROVOpenSSL;
+const XMLCh * DSIGConstants::s_unicodeStrPROVWinCAPI;
//
--------------------------------------------------------------------------------
-// Class instances
+// Constant Strings Creation and Deletion
//
--------------------------------------------------------------------------------
-const XMLCh * const & DSIGConstants::s_unicodeStrEmpty = ::s_unicodeStrEmpty;
-const XMLCh * const & DSIGConstants::s_unicodeStrNL = ::s_unicodeStrNL;
-const XMLCh * const & DSIGConstants::s_unicodeStrXmlns = ::s_unicodeStrXmlns;
-
-const XMLCh * const & DSIGConstants::s_unicodeStrAlgorithm =
::s_unicodeStrAlgorithm;
-
-const XMLCh * const & DSIGConstants::s_unicodeStrURIRawX509 =
::s_unicodeStrURIRawX509;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIDSIG =
::s_unicodeStrURIDSIG;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIEC = ::s_unicodeStrURIEC;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIXPF =
::s_unicodeStrURIXPF;
-const XMLCh * const & DSIGConstants::s_unicodeStrURISHA1 =
::s_unicodeStrURISHA1;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIMD5 =
::s_unicodeStrURIMD5;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIBASE64 =
::s_unicodeStrURIBASE64;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIXPATH =
::s_unicodeStrURIXPATH;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIXSLT =
::s_unicodeStrURIXSLT;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIENVELOPE =
::s_unicodeStrURIENVELOPE;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIC14N_NOC =
::s_unicodeStrURIC14N_NOC;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIC14N_COM =
::s_unicodeStrURIC14N_COM;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIEXC_C14N_NOC =
::s_unicodeStrURIEXC_C14N_NOC;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIEXC_C14N_COM =
::s_unicodeStrURIEXC_C14N_COM;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIDSA_SHA1 =
::s_unicodeStrURIDSA_SHA1;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIRSA_SHA1 =
::s_unicodeStrURIRSA_SHA1;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIHMAC_SHA1 =
::s_unicodeStrURIHMAC_SHA1;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIXMLNS =
::s_unicodeStrURIXMLNS;
-const XMLCh * const & DSIGConstants::s_unicodeStrURIMANIFEST =
::s_unicodeStrURIMANIFEST;
-
-const XMLCh * const & DSIGConstants::s_unicodeStrPROVOpenSSL =
::s_unicodeStrPROVOpenSSL;
-const XMLCh * const & DSIGConstants::s_unicodeStrPROVWinCAPI =
::s_unicodeStrPROVWinCAPI;
-
-//
--------------------------------------------------------------------------------
-// Constant Strings Class
-//
--------------------------------------------------------------------------------
-
-
void DSIGConstants::create() {
// Set up the static strings
- ::s_unicodeStrEmpty = XMLString::transcode("");
- ::s_unicodeStrNL = XMLString::transcode("\n");
- ::s_unicodeStrXmlns = XMLString::transcode("xmlns");
-
- ::s_unicodeStrAlgorithm = XMLString::transcode("Algorithm");
-
- ::s_unicodeStrURIRawX509 = XMLString::transcode(URI_ID_RAWX509);
- ::s_unicodeStrURIDSIG = XMLString::transcode(URI_ID_DSIG);
- ::s_unicodeStrURIEC = XMLString::transcode(URI_ID_EC);
- ::s_unicodeStrURIXPF = XMLString::transcode(URI_ID_XPF);
- ::s_unicodeStrURISHA1 = XMLString::transcode(URI_ID_SHA1);
- ::s_unicodeStrURIMD5 = XMLString::transcode(URI_ID_MD5);
- ::s_unicodeStrURIBASE64 = XMLString::transcode(URI_ID_BASE64);
- ::s_unicodeStrURIXPATH = XMLString::transcode(URI_ID_XPATH);
- ::s_unicodeStrURIXSLT = XMLString::transcode(URI_ID_XSLT);
- ::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_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_unicodeStrURIRSA_SHA1 = XMLString::transcode(URI_ID_RSA_SHA1);
- ::s_unicodeStrURIHMAC_SHA1 = XMLString::transcode(URI_ID_HMAC_SHA1);
- ::s_unicodeStrURIXMLNS = XMLString::transcode(URI_ID_XMLNS);
- ::s_unicodeStrURIMANIFEST = XMLString::transcode(URI_ID_MANIFEST);
- ::s_unicodeStrPROVOpenSSL = XMLString::transcode(PROV_OPENSSL);
- ::s_unicodeStrPROVWinCAPI = XMLString::transcode(PROV_WINCAPI);
+ s_unicodeStrEmpty = XMLString::transcode("");
+ s_unicodeStrNL = XMLString::transcode("\n");
+ s_unicodeStrXmlns = XMLString::transcode("xmlns");
+
+ s_unicodeStrAlgorithm = XMLString::transcode("Algorithm");
+
+ s_unicodeStrURIRawX509 = XMLString::transcode(URI_ID_RAWX509);
+ s_unicodeStrURIDSIG = XMLString::transcode(URI_ID_DSIG);
+ s_unicodeStrURIEC = XMLString::transcode(URI_ID_EC);
+ s_unicodeStrURIXPF = XMLString::transcode(URI_ID_XPF);
+ s_unicodeStrURISHA1 = XMLString::transcode(URI_ID_SHA1);
+ s_unicodeStrURIMD5 = XMLString::transcode(URI_ID_MD5);
+ s_unicodeStrURIBASE64 = XMLString::transcode(URI_ID_BASE64);
+ s_unicodeStrURIXPATH = XMLString::transcode(URI_ID_XPATH);
+ s_unicodeStrURIXSLT = XMLString::transcode(URI_ID_XSLT);
+ 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_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_unicodeStrURIRSA_SHA1 = XMLString::transcode(URI_ID_RSA_SHA1);
+ s_unicodeStrURIHMAC_SHA1 = XMLString::transcode(URI_ID_HMAC_SHA1);
+ s_unicodeStrURIXMLNS = XMLString::transcode(URI_ID_XMLNS);
+ s_unicodeStrURIMANIFEST = XMLString::transcode(URI_ID_MANIFEST);
+ s_unicodeStrPROVOpenSSL = XMLString::transcode(PROV_OPENSSL);
+ s_unicodeStrPROVWinCAPI = XMLString::transcode(PROV_WINCAPI);
}
@@ -178,33 +145,33 @@
void DSIGConstants::destroy() {
// Delete the static strings
- delete[] ::s_unicodeStrEmpty;
- delete[] ::s_unicodeStrNL;
- delete[] ::s_unicodeStrXmlns;
-
- delete[] ::s_unicodeStrAlgorithm;
-
- delete[] ::s_unicodeStrURIRawX509;
- delete[] ::s_unicodeStrURIDSIG;
- delete[] ::s_unicodeStrURIEC;
- delete[] ::s_unicodeStrURIXPF;
- delete[] ::s_unicodeStrURISHA1;
- delete[] ::s_unicodeStrURIMD5;
- delete[] ::s_unicodeStrURIBASE64;
- delete[] ::s_unicodeStrURIXPATH;
- delete[] ::s_unicodeStrURIXSLT;
- delete[] ::s_unicodeStrURIENVELOPE;
- delete[] ::s_unicodeStrURIC14N_NOC;
- delete[] ::s_unicodeStrURIC14N_COM;
- delete[] ::s_unicodeStrURIEXC_C14N_NOC;
- delete[] ::s_unicodeStrURIEXC_C14N_COM;
- delete[] ::s_unicodeStrURIDSA_SHA1;
- delete[] ::s_unicodeStrURIRSA_SHA1;
- delete[] ::s_unicodeStrURIHMAC_SHA1;
- delete[] ::s_unicodeStrURIXMLNS;
- delete[] ::s_unicodeStrURIMANIFEST;
+ delete[] s_unicodeStrEmpty;
+ delete[] s_unicodeStrNL;
+ delete[] s_unicodeStrXmlns;
+
+ delete[] s_unicodeStrAlgorithm;
+
+ delete[] s_unicodeStrURIRawX509;
+ delete[] s_unicodeStrURIDSIG;
+ delete[] s_unicodeStrURIEC;
+ delete[] s_unicodeStrURIXPF;
+ delete[] s_unicodeStrURISHA1;
+ delete[] s_unicodeStrURIMD5;
+ delete[] s_unicodeStrURIBASE64;
+ delete[] s_unicodeStrURIXPATH;
+ delete[] s_unicodeStrURIXSLT;
+ delete[] s_unicodeStrURIENVELOPE;
+ delete[] s_unicodeStrURIC14N_NOC;
+ delete[] s_unicodeStrURIC14N_COM;
+ delete[] s_unicodeStrURIEXC_C14N_NOC;
+ delete[] s_unicodeStrURIEXC_C14N_COM;
+ delete[] s_unicodeStrURIDSA_SHA1;
+ delete[] s_unicodeStrURIRSA_SHA1;
+ delete[] s_unicodeStrURIHMAC_SHA1;
+ delete[] s_unicodeStrURIXMLNS;
+ delete[] s_unicodeStrURIMANIFEST;
- delete[] ::s_unicodeStrPROVOpenSSL;
- delete[] ::s_unicodeStrPROVWinCAPI;
+ delete[] s_unicodeStrPROVOpenSSL;
+ delete[] s_unicodeStrPROVWinCAPI;
}
1.11 +27 -27 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DSIGConstants.hpp 18 May 2003 11:00:02 -0000 1.10
+++ DSIGConstants.hpp 19 May 2003 12:30:59 -0000 1.11
@@ -295,38 +295,38 @@
// General strings
- static const XMLCh * const & s_unicodeStrEmpty; // ""
- static const XMLCh * const & s_unicodeStrNL; // "\n"
- static const XMLCh * const & s_unicodeStrXmlns; // "xmlns"
+ static const XMLCh * s_unicodeStrEmpty; // ""
+ static const XMLCh * s_unicodeStrNL; // "\n"
+ static const XMLCh * s_unicodeStrXmlns; // "xmlns"
// DSIG Element Strings
- static const XMLCh * const & s_unicodeStrAlgorithm;
+ static const XMLCh * s_unicodeStrAlgorithm;
// URI_IDs
- static const XMLCh * const & s_unicodeStrURIDSIG;
- static const XMLCh * const & s_unicodeStrURIEC;
- static const XMLCh * const & s_unicodeStrURIXPF;
+ static const XMLCh * s_unicodeStrURIDSIG;
+ static const XMLCh * s_unicodeStrURIEC;
+ static const XMLCh * s_unicodeStrURIXPF;
- static const XMLCh * const & s_unicodeStrURIRawX509;
- static const XMLCh * const & s_unicodeStrURISHA1;
- static const XMLCh * const & s_unicodeStrURIMD5; // Not
recommended
- static const XMLCh * const & s_unicodeStrURIBASE64;
- static const XMLCh * const & s_unicodeStrURIXPATH;
- static const XMLCh * const & s_unicodeStrURIXSLT;
- static const XMLCh * const & s_unicodeStrURIENVELOPE;
- static const XMLCh * const & s_unicodeStrURIC14N_NOC;
- static const XMLCh * const & s_unicodeStrURIC14N_COM;
- static const XMLCh * const & s_unicodeStrURIEXC_C14N_NOC;
- static const XMLCh * const & s_unicodeStrURIEXC_C14N_COM;
- static const XMLCh * const & s_unicodeStrURIDSA_SHA1;
- static const XMLCh * const & s_unicodeStrURIRSA_SHA1;
- static const XMLCh * const & s_unicodeStrURIHMAC_SHA1;
- static const XMLCh * const & s_unicodeStrURIXMLNS;
- static const XMLCh * const & s_unicodeStrURIMANIFEST;
+ static const XMLCh * s_unicodeStrURIRawX509;
+ static const XMLCh * s_unicodeStrURISHA1;
+ static const XMLCh * s_unicodeStrURIMD5; // Not
recommended
+ static const XMLCh * s_unicodeStrURIBASE64;
+ static const XMLCh * s_unicodeStrURIXPATH;
+ static const XMLCh * s_unicodeStrURIXSLT;
+ static const XMLCh * s_unicodeStrURIENVELOPE;
+ static const XMLCh * s_unicodeStrURIC14N_NOC;
+ static const XMLCh * s_unicodeStrURIC14N_COM;
+ static const XMLCh * s_unicodeStrURIEXC_C14N_NOC;
+ static const XMLCh * s_unicodeStrURIEXC_C14N_COM;
+ static const XMLCh * s_unicodeStrURIDSA_SHA1;
+ static const XMLCh * s_unicodeStrURIRSA_SHA1;
+ static const XMLCh * s_unicodeStrURIHMAC_SHA1;
+ static const XMLCh * s_unicodeStrURIXMLNS;
+ static const XMLCh * s_unicodeStrURIMANIFEST;
// Internal Crypto Providers
- static const XMLCh * const & s_unicodeStrPROVOpenSSL;
- static const XMLCh * const & s_unicodeStrPROVWinCAPI;
+ static const XMLCh * s_unicodeStrPROVOpenSSL;
+ static const XMLCh * s_unicodeStrPROVWinCAPI;
DSIGConstants();
1.6 +8 -6 xml-security/c/src/framework/XSECDefs.hpp
Index: XSECDefs.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECDefs.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECDefs.hpp 11 Apr 2003 12:27:23 -0000 1.5
+++ XSECDefs.hpp 19 May 2003 12:30:59 -0000 1.6
@@ -149,11 +149,13 @@
# pragma warning(disable: 4127 4251 4511 4512 4514 4702 4710 4711 4786
4097; error: 4150 4172 4238 4239 4715)
# define XSEC_NO_COVARIANT_RETURN_TYPE
-
-#elif defined(__GNUC__)
-#elif defined(__INTEL_COMPILER)
-#else
-#error Unknown compiler.
+/*
+ * Removed to allow any compiler to compile - might not work, but ....
+ * #elif defined(__GNUC__)
+ * #elif defined(__INTEL_COMPILER)
+ * #else
+ * #error Unknown compiler.
+ */
#endif
1.4 +5 -2
xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.cpp
Index: XSECBinHTTPURIInputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/unixutils/XSECBinHTTPURIInputStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECBinHTTPURIInputStream.cpp 23 Mar 2003 09:49:49 -0000 1.3
+++ XSECBinHTTPURIInputStream.cpp 19 May 2003 12:31:00 -0000 1.4
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.4 2003/05/19 12:31:00 blautenb
+ * Cleaned up constants so can compile under INTEL compiler
+ *
* Revision 1.3 2003/03/23 09:49:49 blautenb
* Silly mistype in ==
*
@@ -150,7 +153,7 @@
if ((hostEntPtr = gethostbyname(hostNameAsCharStar)) == NULL)
{
unsigned long numAddress = inet_addr(hostNameAsCharStar);
- if (numAddress < 0)
+ if (numAddress == 0)
{
ThrowXML(NetAccessorException,
XMLExcepts::NetAcc_TargetResolution);
