blautenb 2004/03/06 23:52:12
Modified: c/src/dsig DSIGKeyInfoSPKIData.cpp
c/src/xenc/impl XENCAlgorithmHandlerDefault.hpp
XENCEncryptedTypeImpl.cpp
XENCEncryptionMethodImpl.cpp
Log:
Clean compile under Intel C++ compiler
Revision Changes Path
1.9 +2 -2 xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp
Index: DSIGKeyInfoSPKIData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DSIGKeyInfoSPKIData.cpp 7 Mar 2004 03:20:51 -0000 1.8
+++ DSIGKeyInfoSPKIData.cpp 7 Mar 2004 07:52:12 -0000 1.9
@@ -134,7 +134,7 @@
const XMLCh * DSIGKeyInfoSPKIData::getSexp(unsigned int index) {
- if (index < 0 || index >= m_sexpList.size()) {
+ if (index >= m_sexpList.size()) {
throw XSECException(XSECException::KeyInfoError,
"DSIGKeyInfoSPKIData::getSexp - index out of range");
1.7 +2 -2
xml-security/c/src/xenc/impl/XENCAlgorithmHandlerDefault.hpp
Index: XENCAlgorithmHandlerDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/xenc/impl/XENCAlgorithmHandlerDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XENCAlgorithmHandlerDefault.hpp 8 Feb 2004 10:26:01 -0000 1.6
+++ XENCAlgorithmHandlerDefault.hpp 7 Mar 2004 07:52:12 -0000 1.7
@@ -90,7 +90,7 @@
XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result);
- bool XENCAlgorithmHandlerDefault::doRSAEncryptToSafeBuffer(
+ bool doRSAEncryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
XSECCryptoKey * key,
1.16 +4 -4 xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp
Index: XENCEncryptedTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedTypeImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XENCEncryptedTypeImpl.cpp 29 Feb 2004 06:39:45 -0000 1.15
+++ XENCEncryptedTypeImpl.cpp 7 Mar 2004 07:52:12 -0000 1.16
@@ -496,7 +496,7 @@
mp_encryptedTypeElement->setAttributeNS(NULL, s_Type, uri);
mp_typeAttr = mp_encryptedTypeElement->getAttributeNodeNS(NULL,
s_Type);
- if (mp_typeAttr = NULL) {
+ if (mp_typeAttr == NULL) {
throw XSECException(XSECException::InternalError,
"XENCEncryptedTypeImpl::setTypeURI - Cannot
find the attribute I just added");
@@ -529,7 +529,7 @@
// Need to create the node
mp_encryptedTypeElement->setAttributeNS(NULL, s_MimeType,
mimeType);
mp_mimeTypeAttr =
mp_encryptedTypeElement->getAttributeNodeNS(NULL, s_MimeType);
- if (mp_mimeTypeAttr = NULL) {
+ if (mp_mimeTypeAttr == NULL) {
throw XSECException(XSECException::InternalError,
"XENCEncryptedTypeImpl::setMimeType - Cannot
find the attribute I just added");
@@ -563,7 +563,7 @@
mp_encryptedTypeElement->setAttributeNS(NULL, s_Encoding, uri);
mp_encodingAttr =
mp_encryptedTypeElement->getAttributeNodeNS(NULL, s_Encoding);
- if (mp_encodingAttr = NULL) {
+ if (mp_encodingAttr == NULL) {
throw XSECException(XSECException::InternalError,
"XENCEncryptedTypeImpl::setEncodingURI - Cannot
find the attribute I just added");
1.6 +2 -2 xml-security/c/src/xenc/impl/XENCEncryptionMethodImpl.cpp
Index: XENCEncryptionMethodImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/xenc/impl/XENCEncryptionMethodImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XENCEncryptionMethodImpl.cpp 8 Feb 2004 10:26:01 -0000 1.5
+++ XENCEncryptionMethodImpl.cpp 7 Mar 2004 07:52:12 -0000 1.6
@@ -276,7 +276,7 @@
const XMLCh * keyVal = mp_keySizeTextNode->getNodeValue();
unsigned int res = 0;
- if (!XMLString::textToBin(keyVal, res) || res < 0) {
+ if (!XMLString::textToBin(keyVal, res)) {
throw
XSECException(XSECException::EncryptionMethodError,
"XENCEncryptionMethod::getKeySize - Cannot
convert KeySize to integer");
}
