blautenb 2004/03/09 03:16:54
Modified: c/src/dsig DSIGKeyInfoList.cpp DSIGReference.cpp
c/src/enc/OpenSSL OpenSSLCryptoSymmetricKey.cpp
c/src/samples simpleDecrypt.cpp simpleEncrypt.cpp
c/src/tools/checksig InteropResolver.cpp
c/src/tools/cipher XencInteropResolver.cpp cipher.cpp
c/src/transformers TXFMXSL.cpp
c/src/xenc/impl XENCCipherImpl.cpp
XENCCipherReferenceImpl.cpp
XENCEncryptedKeyImpl.cpp
Log:
Clean build with gcc 3.3 on debian unstable
Revision Changes Path
1.19 +2 -10 xml-security/c/src/dsig/DSIGKeyInfoList.cpp
Index: DSIGKeyInfoList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoList.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DSIGKeyInfoList.cpp 29 Feb 2004 06:39:44 -0000 1.18
+++ DSIGKeyInfoList.cpp 9 Mar 2004 11:16:53 -0000 1.19
@@ -423,7 +423,6 @@
}
// Create the new element
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoValue * v;
XSECnew(v, DSIGKeyInfoValue(mp_env));
@@ -448,7 +447,6 @@
}
// Create the new element
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoValue * v;
XSECnew(v, DSIGKeyInfoValue(mp_env));
@@ -472,7 +470,6 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoX509 * x;
XSECnew(x, DSIGKeyInfoX509(mp_env));
@@ -496,7 +493,6 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoName * n;
XSECnew(n, DSIGKeyInfoName(mp_env));
@@ -520,7 +516,6 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoPGPData * p;
XSECnew(p, DSIGKeyInfoPGPData(mp_env));
@@ -543,7 +538,6 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoSPKIData * s;
XSECnew(s, DSIGKeyInfoSPKIData(mp_env));
@@ -566,7 +560,6 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
DSIGKeyInfoMgmtData * m;
XSECnew(m, DSIGKeyInfoMgmtData(mp_env));
@@ -593,10 +586,9 @@
}
- DOMDocument * doc = mp_env->getParentDocument();
mp_keyInfoNode->appendChild(ref->getKeyInfoDOMNode());
mp_env->doPrettyPrint(mp_keyInfoNode);
addKeyInfo(ref);
-}
\ No newline at end of file
+}
1.23 +1 -3 xml-security/c/src/dsig/DSIGReference.cpp
Index: DSIGReference.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DSIGReference.cpp 7 Mar 2004 03:20:51 -0000 1.22
+++ DSIGReference.cpp 9 Mar 2004 11:16:53 -0000 1.23
@@ -193,8 +193,6 @@
void DSIGReference::addTransform(DSIGTransform * txfm, DOMElement * txfmElt)
{
- DOMDocument *doc = mp_env->getParentDocument();
-
if (mp_transformList == NULL)
createTransformList();
1.13 +2 -2
xml-security/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp
Index: OpenSSLCryptoSymmetricKey.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- OpenSSLCryptoSymmetricKey.cpp 18 Feb 2004 10:46:52 -0000 1.12
+++ OpenSSLCryptoSymmetricKey.cpp 9 Mar 2004 11:16:54 -0000 1.13
@@ -27,12 +27,12 @@
*/
#include <xsec/framework/XSECDefs.hpp>
+#include <iostream>
#include <xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xercesc/util/Janitor.hpp>
-#include <iostream>
XERCES_CPP_NAMESPACE_USE;
#if defined (HAVE_OPENSSL)
1.3 +2 -2 xml-security/c/src/samples/simpleDecrypt.cpp
Index: simpleDecrypt.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleDecrypt.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simpleDecrypt.cpp 8 Feb 2004 10:24:38 -0000 1.2
+++ simpleDecrypt.cpp 9 Mar 2004 11:16:54 -0000 1.3
@@ -183,4 +183,4 @@
return 0;
-}
\ No newline at end of file
+}
1.3 +1 -2 xml-security/c/src/samples/simpleEncrypt.cpp
Index: simpleEncrypt.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleEncrypt.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simpleEncrypt.cpp 8 Feb 2004 10:24:38 -0000 1.2
+++ simpleEncrypt.cpp 9 Mar 2004 11:16:54 -0000 1.3
@@ -55,7 +55,6 @@
XERCES_CPP_NAMESPACE_USE
DOMElement * g_toEncrypt;
-static unsigned char s_key[] = "abcdefghijklmnopqrstuvwx";
char cert[] = "\n\
MIIC7jCCAq6gAwIBAgICEAMwCQYHKoZIzjgEAzB5MQswCQYDVQQGEwJBVTEMMAoG\n\
1.11 +2 -2 xml-security/c/src/tools/checksig/InteropResolver.cpp
Index: InteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InteropResolver.cpp 7 Mar 2004 03:20:51 -0000 1.10
+++ InteropResolver.cpp 9 Mar 2004 11:16:54 -0000 1.11
@@ -125,7 +125,7 @@
#if defined(_WIN32)
res = _findnext(m_handle, &m_finder);
#else
- if (m_fcount == m_globbuf.gl_pathc)
+ if (m_fcount == (int) m_globbuf.gl_pathc)
res = -1;
else
res = 0;
1.6 +1 -11 xml-security/c/src/tools/cipher/XencInteropResolver.cpp
Index: XencInteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/XencInteropResolver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XencInteropResolver.cpp 7 Mar 2004 03:20:51 -0000 1.5
+++ XencInteropResolver.cpp 9 Mar 2004 11:16:54 -0000 1.6
@@ -526,7 +526,6 @@
// Check the serial number
BIGNUM * bnserial =
ASN1_INTEGER_to_BN(x509->cert_info->serialNumber, NULL);
- char * xserial = BN_bn2dec(bnserial);
BN_free(bnserial);
BIO * rsaFile =
createFileBIO(mp_baseURI, "rsa.p8");
@@ -541,15 +540,6 @@
PKCS8_PRIV_KEY_INFO_free(p8inf);
BIO_free_all(rsaFile);
return k;
-
//d2i_PKCS8PrivateKey_bio(rsaFile, NULL, NULL, NULL);
-
-/* if (strcmp(xserial, cserial) == 0) {
-
- OPENSSL_free(xserial);
- delete[] cserial;
- return true;
-
- }*/
}
#if defined (HAVE_WINCAPI)
1.16 +7 -6 xml-security/c/src/tools/cipher/cipher.cpp
Index: cipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/cipher.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cipher.cpp 21 Feb 2004 08:26:54 -0000 1.15
+++ cipher.cpp 9 Mar 2004 11:16:54 -0000 1.16
@@ -199,9 +199,9 @@
bool doXMLOutput = false;
XSECCryptoKey * kek = NULL;
XSECCryptoKey * key = NULL;
- int keyLen;
- encryptionMethod kekAlg;
- encryptionMethod keyAlg;
+ int keyLen = 0;
+ encryptionMethod kekAlg = ENCRYPT_NONE;
+ encryptionMethod keyAlg = ENCRYPT_NONE;
DOMDocument *doc;
unsigned char keyBuf[24];
XMLFormatTarget *formatTarget ;
@@ -269,7 +269,8 @@
// Have a key!
paramCount++;
bool isKEK = false;
- XSECCryptoSymmetricKey::SymmetricKeyType loadKeyAs;
+ XSECCryptoSymmetricKey::SymmetricKeyType loadKeyAs =
+ XSECCryptoSymmetricKey::KEY_NONE;
if (stricmp(argv[paramCount], "kek") == 0) {
isKEK = true;
@@ -471,7 +472,7 @@
}
}
-#endif /* HAVE_OPENSSL */.
+#endif /* HAVE_OPENSSL */
else {
cerr << "Unknown option: " << argv[paramCount] << endl;
1.11 +3 -2 xml-security/c/src/transformers/TXFMXSL.cpp
Index: TXFMXSL.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TXFMXSL.cpp 7 Mar 2004 03:20:52 -0000 1.10
+++ TXFMXSL.cpp 9 Mar 2004 11:16:54 -0000 1.11
@@ -164,7 +164,8 @@
txoh.buffer.sbStrcpyIn("");
txoh.offset = 0;
- int res = xt.transform(&theXMLStream, &theXSLStream, (void *) & txoh,
TransformXSLOutputFn);
+ /*int res = */
+ xt.transform(&theXMLStream, &theXSLStream, (void *) & txoh,
TransformXSLOutputFn);
// Should check res
1.19 +1 -2 xml-security/c/src/xenc/impl/XENCCipherImpl.cpp
Index: XENCCipherImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XENCCipherImpl.cpp 7 Mar 2004 03:20:52 -0000 1.18
+++ XENCCipherImpl.cpp 9 Mar 2004 11:16:54 -0000 1.19
@@ -492,7 +492,6 @@
// Have something to replace current element with
DOMNode * p = element->getParentNode();
- DOMNode * c = frag->getFirstChild();
// By inserting the DocumentFragment, we effectively insert the
children
p->replaceChild(frag, element);
1.4 +1 -3 xml-security/c/src/xenc/impl/XENCCipherReferenceImpl.cpp
Index: XENCCipherReferenceImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherReferenceImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XENCCipherReferenceImpl.cpp 8 Feb 2004 10:26:01 -0000 1.3
+++ XENCCipherReferenceImpl.cpp 9 Mar 2004 11:16:54 -0000 1.4
@@ -144,8 +144,6 @@
void XENCCipherReferenceImpl::addTransform(DSIGTransform * txfm, DOMElement
* txfmElt) {
- DOMDocument *doc = mp_env->getParentDocument();
-
if (mp_transformList == NULL)
createTransformList();
1.5 +3 -3 xml-security/c/src/xenc/impl/XENCEncryptedKeyImpl.cpp
Index: XENCEncryptedKeyImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCEncryptedKeyImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XENCEncryptedKeyImpl.cpp 8 Feb 2004 10:26:01 -0000 1.4
+++ XENCEncryptedKeyImpl.cpp 9 Mar 2004 11:16:54 -0000 1.5
@@ -97,16 +97,16 @@
XENCEncryptedKeyImpl::XENCEncryptedKeyImpl(const XSECEnv * env) :
-XENCEncryptedTypeImpl(env),
XENCEncryptedKey(env),
+XENCEncryptedTypeImpl(env),
mp_carriedKeyNameTextNode(NULL),
mp_recipientAttr(NULL) {
}
XENCEncryptedKeyImpl::XENCEncryptedKeyImpl(const XSECEnv * env, DOMElement *
node) :
-XENCEncryptedTypeImpl(env, node),
XENCEncryptedKey(env),
+XENCEncryptedTypeImpl(env, node),
mp_carriedKeyNameTextNode(NULL),
mp_recipientAttr(NULL) {
