[xml-security-c] 02/08: New patches fixing GCC-6 FTBFS, warnings and typos
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Thu Jul 21 11:59:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to branch master
in repository xml-security-c.
commit 9af4b2f6918526855601cc8cf8fd8e9104c16879
Author: Ferenc Wágner <wferi at niif.hu>
Date: Sat Jun 25 16:13:30 2016 +0200
New patches fixing GCC-6 FTBFS, warnings and typos
Closes: #811620
---
.../Avoid-GCC-warning-suggesting-parentheses.patch | 25 +
.../patches/Don-t-compute-unused-variables.patch | 47 ++
debian/patches/Fix-GCC5-warnings.patch | 35 ++
debian/patches/Fix-GCC6-FTBFS.patch | 21 +
debian/patches/Fix-indentation-1.patch | 84 +++
debian/patches/Fix-indentation-2.patch | 36 ++
debian/patches/Fix-indentation-3.patch | 23 +
debian/patches/Fix-indentation-4.patch | 39 ++
debian/patches/Fix-indentation-5.patch | 23 +
debian/patches/Fix-typo-occured-occurred.patch | 639 +++++++++++++++++++++
.../Remove-superfluous-extern-keyword.patch | 21 +
debian/patches/Remove-unused-dereferences.patch | 112 ++++
debian/patches/Remove-unused-variable-1.patch | 22 +
debian/patches/Remove-unused-variable-2.patch | 86 +++
debian/patches/Remove-unused-variable-3.patch | 34 ++
...tFile-close-output-file-only-if-it-s-open.patch | 25 +
...the-z-length-modifier-for-printing-size_t.patch | 21 +
...-fix-potential-reading-past-unterminated-.patch | 21 +
debian/patches/series | 18 +
19 files changed, 1332 insertions(+)
diff --git a/debian/patches/Avoid-GCC-warning-suggesting-parentheses.patch b/debian/patches/Avoid-GCC-warning-suggesting-parentheses.patch
new file mode 100644
index 0000000..df1c4e7
--- /dev/null
+++ b/debian/patches/Avoid-GCC-warning-suggesting-parentheses.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 01:26:38 +0100
+Subject: Avoid GCC warning suggesting parentheses
+
+---
+ xsec/utils/XSECDOMUtils.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/xsec/utils/XSECDOMUtils.cpp b/xsec/utils/XSECDOMUtils.cpp
+index 4937434..486a33d 100644
+--- a/xsec/utils/XSECDOMUtils.cpp
++++ b/xsec/utils/XSECDOMUtils.cpp
+@@ -709,9 +709,9 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+
+ static bool isHexDigit(const XMLCh toCheck)
+ {
+- if ((toCheck >= chDigit_0) && (toCheck <= chDigit_9)
+- || (toCheck >= chLatin_A) && (toCheck <= chLatin_F)
+- || (toCheck >= chLatin_a) && (toCheck <= chLatin_f))
++ if ((toCheck >= chDigit_0 && toCheck <= chDigit_9)
++ || (toCheck >= chLatin_A && toCheck <= chLatin_F)
++ || (toCheck >= chLatin_a && toCheck <= chLatin_f))
+ {
+ return true;
+ }
diff --git a/debian/patches/Don-t-compute-unused-variables.patch b/debian/patches/Don-t-compute-unused-variables.patch
new file mode 100644
index 0000000..9ab6d44
--- /dev/null
+++ b/debian/patches/Don-t-compute-unused-variables.patch
@@ -0,0 +1,47 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:37:51 +0100
+Subject: Don't compute unused variables
+
+---
+ xsec/utils/XSECNameSpaceExpander.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/xsec/utils/XSECNameSpaceExpander.cpp b/xsec/utils/XSECNameSpaceExpander.cpp
+index ff147b7..448469e 100644
+--- a/xsec/utils/XSECNameSpaceExpander.cpp
++++ b/xsec/utils/XSECNameSpaceExpander.cpp
+@@ -158,7 +158,6 @@ void XSECNameSpaceExpander::expandNameSpaces(void) {
+ DOMElement *docElt; // The document element - do not expand it's namespaces
+
+ docElt = mp_fragment; //mp_doc->getDocumentElement();
+- int count = attNodeCount(docElt);
+
+ DOMNode *c;
+
+@@ -172,8 +171,6 @@ void XSECNameSpaceExpander::expandNameSpaces(void) {
+
+ m_expanded = true;
+
+- count = attNodeCount(docElt);
+-
+ }
+
+
+@@ -182,9 +179,6 @@ void XSECNameSpaceExpander::deleteAddedNamespaces(void) {
+ NameSpaceEntryListVectorType::size_type size = m_lst.size();
+ XSECNameSpaceEntry *e;
+
+- DOMElement *docElt = mp_fragment; //mp_doc->getDocumentElement();
+- int count = attNodeCount(docElt);
+-
+ NameSpaceEntryListVectorType::size_type i;
+
+ for (i = 0; i < size; ++i) {
+@@ -206,7 +200,6 @@ void XSECNameSpaceExpander::deleteAddedNamespaces(void) {
+ // Now done - empty everything
+ m_lst.clear();
+ m_expanded = false;
+- count = attNodeCount(docElt);
+
+ }
+
diff --git a/debian/patches/Fix-GCC5-warnings.patch b/debian/patches/Fix-GCC5-warnings.patch
new file mode 100644
index 0000000..ff0af51
--- /dev/null
+++ b/debian/patches/Fix-GCC5-warnings.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 21:59:31 +0100
+Subject: Fix GCC5 warnings
+
+---
+ xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp | 2 +-
+ xsec/enc/XSECCryptoSymmetricKey.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
+index ceabb92..d61a776 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
+@@ -151,7 +151,7 @@ public :
+ SymmetricKeyMode mode = MODE_CBC,
+ const unsigned char * iv = NULL,
+ const unsigned char* tag = NULL,
+- unsigned int taglen = NULL);
++ unsigned int taglen = 0);
+
+ /**
+ * \brief Continue an decrypt operation using this key.
+diff --git a/xsec/enc/XSECCryptoSymmetricKey.hpp b/xsec/enc/XSECCryptoSymmetricKey.hpp
+index 3bb5188..44c1e65 100644
+--- a/xsec/enc/XSECCryptoSymmetricKey.hpp
++++ b/xsec/enc/XSECCryptoSymmetricKey.hpp
+@@ -185,7 +185,7 @@ public :
+ SymmetricKeyMode mode = MODE_CBC,
+ const unsigned char* iv = NULL,
+ const unsigned char* tag = NULL,
+- unsigned int taglen = NULL) = 0;
++ unsigned int taglen = 0) = 0;
+
+ /**
+ * \brief Continue a decrypt operation using this key.
diff --git a/debian/patches/Fix-GCC6-FTBFS.patch b/debian/patches/Fix-GCC6-FTBFS.patch
new file mode 100644
index 0000000..5cd95a7
--- /dev/null
+++ b/debian/patches/Fix-GCC6-FTBFS.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 21:55:41 +0100
+Subject: Fix GCC6 FTBFS
+
+---
+ xsec/tools/checksig/InteropResolver.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xsec/tools/checksig/InteropResolver.cpp b/xsec/tools/checksig/InteropResolver.cpp
+index e700b99..f35e087 100644
+--- a/xsec/tools/checksig/InteropResolver.cpp
++++ b/xsec/tools/checksig/InteropResolver.cpp
+@@ -645,7 +645,7 @@ XSECCryptoKey * InteropResolver::resolveKey(DSIGKeyInfoList * lst) {
+
+ }
+
+- return false;
++ return NULL;
+
+ }
+
diff --git a/debian/patches/Fix-indentation-1.patch b/debian/patches/Fix-indentation-1.patch
new file mode 100644
index 0000000..6c37dda
--- /dev/null
+++ b/debian/patches/Fix-indentation-1.patch
@@ -0,0 +1,84 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 22:10:59 +0100
+Subject: Fix indentation 1
+
+---
+ xsec/canon/XSECC14n20010315.cpp | 6 +++---
+ xsec/dsig/DSIGReference.cpp | 8 ++++----
+ xsec/dsig/DSIGSignature.cpp | 6 +++---
+ xsec/dsig/DSIGTransformXSL.cpp | 6 +++---
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/xsec/canon/XSECC14n20010315.cpp b/xsec/canon/XSECC14n20010315.cpp
+index 717c87a..9bdcd2b 100644
+--- a/xsec/canon/XSECC14n20010315.cpp
++++ b/xsec/canon/XSECC14n20010315.cpp
+@@ -757,9 +757,9 @@ bool XSECC14n20010315::checkRenderNameSpaceNode(DOMNode *e, DOMNode *a) {
+ if (m_XPathSelection && ! m_XPathMap.hasNode(a))
+ return false;
+
+- // BUGFIX: we need to skip xmlns:xml if the value is http://www.w3.org/XML/1998/namespace
+- if (strEquals(a->getLocalName(), "xml") && strEquals(a->getNodeValue(), "http://www.w3.org/XML/1998/namespace"))
+- return false;
++ // BUGFIX: we need to skip xmlns:xml if the value is http://www.w3.org/XML/1998/namespace
++ if (strEquals(a->getLocalName(), "xml") && strEquals(a->getNodeValue(), "http://www.w3.org/XML/1998/namespace"))
++ return false;
+
+ // First - are we exclusive?
+
+diff --git a/xsec/dsig/DSIGReference.cpp b/xsec/dsig/DSIGReference.cpp
+index dff5e85..4a06d98 100644
+--- a/xsec/dsig/DSIGReference.cpp
++++ b/xsec/dsig/DSIGReference.cpp
+@@ -1306,10 +1306,10 @@ unsigned int DSIGReference::calculateHash(XMLByte *toFill, unsigned int maxToFil
+
+ }
+
+- // Check for debugging sink for the data
+- TXFMBase* sink = XSECPlatformUtils::GetReferenceLoggingSink(d);
+- if (sink)
+- chain->appendTxfm(sink);
++ // Check for debugging sink for the data
++ TXFMBase* sink = XSECPlatformUtils::GetReferenceLoggingSink(d);
++ if (sink)
++ chain->appendTxfm(sink);
+
+
+ // Get the mapping for the hash transform
+diff --git a/xsec/dsig/DSIGSignature.cpp b/xsec/dsig/DSIGSignature.cpp
+index f43a8ee..2f177a0 100644
+--- a/xsec/dsig/DSIGSignature.cpp
++++ b/xsec/dsig/DSIGSignature.cpp
+@@ -856,9 +856,9 @@ unsigned int DSIGSignature::calculateSignedInfoHash(unsigned char * hashBuf,
+ Janitor<TXFMChain> j_chain(chain);
+
+ // Check for debugging sink for the data
+- TXFMBase* sink = XSECPlatformUtils::GetReferenceLoggingSink(mp_doc);
+- if (sink)
+- chain->appendTxfm(sink);
++ TXFMBase* sink = XSECPlatformUtils::GetReferenceLoggingSink(mp_doc);
++ if (sink)
++ chain->appendTxfm(sink);
+
+ // Setup Hash
+ // First find the appropriate handler for the URI
+diff --git a/xsec/dsig/DSIGTransformXSL.cpp b/xsec/dsig/DSIGTransformXSL.cpp
+index 22d997b..a65f7f8 100644
+--- a/xsec/dsig/DSIGTransformXSL.cpp
++++ b/xsec/dsig/DSIGTransformXSL.cpp
+@@ -207,12 +207,12 @@ DOMNode * DSIGTransformXSL::setStylesheet(DOMNode * stylesheet) {
+ DOMNode * ret = mp_stylesheetNode;
+
+ if (mp_stylesheetNode) {
+- if (stylesheet)
+- mp_txfmNode->insertBefore(stylesheet, mp_stylesheetNode);
++ if (stylesheet)
++ mp_txfmNode->insertBefore(stylesheet, mp_stylesheetNode);
+ mp_txfmNode->removeChild(mp_stylesheetNode);
+ }
+ else if (stylesheet) {
+- mp_txfmNode->appendChild(stylesheet);
++ mp_txfmNode->appendChild(stylesheet);
+ }
+
+ mp_stylesheetNode = stylesheet;
diff --git a/debian/patches/Fix-indentation-2.patch b/debian/patches/Fix-indentation-2.patch
new file mode 100644
index 0000000..391455a
--- /dev/null
+++ b/debian/patches/Fix-indentation-2.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:40:44 +0100
+Subject: Fix indentation 2
+
+---
+ xsec/xkms/impl/XKMSRegisterResultImpl.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xsec/xkms/impl/XKMSRegisterResultImpl.cpp b/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
+index d51f2ef..36bc0ee 100644
+--- a/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
++++ b/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
+@@ -324,8 +324,8 @@ XENCEncryptedData * XKMSRegisterResultImpl::setRSAKeyPair(const char * passPhras
+ }
+ uri = algorithmSB.sbStrToXMLCh();
+ }
+- else
+- uri = algorithmURI;
++ else
++ uri = algorithmURI;
+
+ // Find if we can get an algorithm for this URI
+ XSECAlgorithmHandler *handler;
+@@ -342,10 +342,10 @@ XENCEncryptedData * XKMSRegisterResultImpl::setRSAKeyPair(const char * passPhras
+ unsigned char kbuf[XSEC_MAX_HASH_SIZE];
+ unsigned int len = CalculateXKMSKEK((unsigned char *) passPhrase, (int) strlen(passPhrase), kbuf, XSEC_MAX_HASH_SIZE);
+
+- if (len == 0) {
++ if (len == 0) {
+ throw XSECException(XSECException::XKMSError,
+ "XKMSRegisterResult::setRSAKeyPair - error deriving KEK");
+- }
++ }
+
+
+ XSECCryptoKey * sk = handler->createKeyForURI(
diff --git a/debian/patches/Fix-indentation-3.patch b/debian/patches/Fix-indentation-3.patch
new file mode 100644
index 0000000..b3a02a5
--- /dev/null
+++ b/debian/patches/Fix-indentation-3.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:46:26 +0100
+Subject: Fix indentation 3
+
+---
+ xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp
+index 189bc0f..3233343 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp
+@@ -307,8 +307,8 @@ XSECCryptoKey * OpenSSLCryptoKeyEC::clone() const {
+ XSECnew(ret, OpenSSLCryptoKeyEC);
+
+ ret->m_keyType = m_keyType;
+- if (mp_ecKey)
+- ret->mp_ecKey = EC_KEY_dup(mp_ecKey);
++ if (mp_ecKey)
++ ret->mp_ecKey = EC_KEY_dup(mp_ecKey);
+
+ return ret;
+
diff --git a/debian/patches/Fix-indentation-4.patch b/debian/patches/Fix-indentation-4.patch
new file mode 100644
index 0000000..b69969f
--- /dev/null
+++ b/debian/patches/Fix-indentation-4.patch
@@ -0,0 +1,39 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:59:52 +0100
+Subject: Fix indentation 4
+
+---
+ xsec/tools/c14n/c14n.cpp | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/xsec/tools/c14n/c14n.cpp b/xsec/tools/c14n/c14n.cpp
+index c3415e9..16315cc 100644
+--- a/xsec/tools/c14n/c14n.cpp
++++ b/xsec/tools/c14n/c14n.cpp
+@@ -179,17 +179,17 @@ int main(int argc, char **argv) {
+ }
+
+ // Create the canonicalizer
+- XSECC14n20010315* canon=NULL;
+- if (subtree)
+- canon = new XSECC14n20010315(theDOM, subtree);
+- else
+- canon = new XSECC14n20010315(theDOM);
++ XSECC14n20010315* canon=NULL;
++ if (subtree)
++ canon = new XSECC14n20010315(theDOM, subtree);
++ else
++ canon = new XSECC14n20010315(theDOM);
+ canon->setCommentsProcessing(printComments);
+ canon->setUseNamespaceStack(true);
+- if (inclusive11)
+- canon->setInclusive11();
+- else if (exclusive)
+- canon->setExclusive();
++ if (inclusive11)
++ canon->setInclusive11();
++ else if (exclusive)
++ canon->setExclusive();
+
+ // canon->XPathSelectNodes("(/descendant-or-self::node() | /descendant-or-self::node()/attribute::* | /descendant-or-self::node()/namespace::*)[ self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2)) or count (id(\"E3\") | ancestor-or-self::node()) = count (ancestor-or-self::node())]");
+
diff --git a/debian/patches/Fix-indentation-5.patch b/debian/patches/Fix-indentation-5.patch
new file mode 100644
index 0000000..5783fcd
--- /dev/null
+++ b/debian/patches/Fix-indentation-5.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 01:19:01 +0100
+Subject: Fix indentation 5
+
+---
+ xsec/xkms/impl/XKMSRecoverResultImpl.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xsec/xkms/impl/XKMSRecoverResultImpl.cpp b/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
+index 4cdbfba..1f90870 100644
+--- a/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
++++ b/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
+@@ -324,8 +324,8 @@ XENCEncryptedData * XKMSRecoverResultImpl::setRSAKeyPair(const char * passPhrase
+ }
+ uri = algorithmSB.sbStrToXMLCh();
+ }
+- else
+- uri = algorithmURI;
++ else
++ uri = algorithmURI;
+
+ // Find if we can get an algorithm for this URI
+ XSECAlgorithmHandler *handler;
diff --git a/debian/patches/Fix-typo-occured-occurred.patch b/debian/patches/Fix-typo-occured-occurred.patch
new file mode 100644
index 0000000..ac119b7
--- /dev/null
+++ b/debian/patches/Fix-typo-occured-occurred.patch
@@ -0,0 +1,639 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 09:04:11 +0100
+Subject: Fix typo: occured -> occurred
+
+---
+ xsec/dsig/DSIGAlgorithmHandlerDefault.cpp | 6 ++--
+ xsec/framework/XSECError.cpp | 10 +++----
+ xsec/samples/simpleHMAC.cpp | 2 +-
+ xsec/samples/simpleValidate.cpp | 4 +--
+ xsec/tools/c14n/c14n.cpp | 4 +--
+ xsec/tools/checksig/checksig.cpp | 10 +++----
+ xsec/tools/cipher/cipher.cpp | 8 +++---
+ xsec/tools/siginf/siginf.cpp | 8 +++---
+ xsec/tools/templatesign/templatesign.cpp | 8 +++---
+ xsec/tools/txfmout/txfmout.cpp | 6 ++--
+ xsec/tools/xklient/xklient.cpp | 10 +++----
+ xsec/tools/xtest/xtest.cpp | 46 +++++++++++++++----------------
+ xsec/transformers/TXFMParser.cpp | 2 +-
+ xsec/transformers/TXFMXSL.cpp | 2 +-
+ xsec/xenc/impl/XENCCipherImpl.cpp | 2 +-
+ 15 files changed, 64 insertions(+), 64 deletions(-)
+
+diff --git a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
+index e60b84c..eb2112e 100644
+--- a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
++++ b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
+@@ -420,7 +420,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
+ if (b64Len <= 0) {
+
+ throw XSECException(XSECException::AlgorithmMapperError,
+- "Unknown error occured during a DSA Signing operation");
++ "Unknown error occurred during a DSA Signing operation");
+
+ }
+ else if (b64Len >= MAXB64BUFSIZE) {
+@@ -457,7 +457,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
+ if (b64Len <= 0) {
+
+ throw XSECException(XSECException::AlgorithmMapperError,
+- "Unknown error occured during a RSA Signing operation");
++ "Unknown error occurred during a RSA Signing operation");
+
+ }
+ else if (b64Len >= MAXB64BUFSIZE) {
+@@ -495,7 +495,7 @@ unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
+ if (b64Len <= 0) {
+
+ throw XSECException(XSECException::AlgorithmMapperError,
+- "Unknown error occured during an ECDSA Signing operation");
++ "Unknown error occurred during an ECDSA Signing operation");
+
+ }
+ else if (b64Len >= MAXB64BUFSIZE) {
+diff --git a/xsec/framework/XSECError.cpp b/xsec/framework/XSECError.cpp
+index b672384..4c1470b 100644
+--- a/xsec/framework/XSECError.cpp
++++ b/xsec/framework/XSECError.cpp
+@@ -45,8 +45,8 @@ const char * XSECExceptionStrings [] = {
+ "Transform input/output mismatch",
+ "Referenced ID is not in DOM Document",
+ "Unsupported Xpointer expression found",
+- "An error occured during an XPath evalaution",
+- "An error occured during an XSLT transformation",
++ "An error occurred during an XPath evalaution",
++ "An error occurred during an XSLT transformation",
+ "The called feature is unsupported (general error)",
+ "Attempted to load an empty signature node",
+ "Attempted to load a non signature DOM Node as a <Signature>",
+@@ -55,7 +55,7 @@ const char * XSECExceptionStrings [] = {
+ "Attempted to load an empty X509Data Node",
+ "Attempted to load a non X509Data node as a <X509Data>",
+ "Error occurred in OpenSSL routine",
+- "Error occured when attempting to Verify a Signature",
++ "Error occurred when attempting to Verify a Signature",
+ "Attempted to load an empty SignedInfo node",
+ "Attempted to load a non SignedInfo node as a <SignedInfo>",
+ "Expected URI attribute in <REFERENCE> node",
+@@ -72,8 +72,8 @@ const char * XSECExceptionStrings [] = {
+ "CATASTROPHE - An error has been found in internal state",
+ "An error occurred in the Envelope Transform handler",
+ "A function has been called which is not supported in the compiled library",
+- "An error occured in a DSIGTransform holder",
+- "An error occured in a safe buffer",
++ "An error occurred in a DSIGTransform holder",
++ "An error occurred in a safe buffer",
+ "An error occurred processing an HTTP request via internal resolver",
+ "An error occurred decoding a DSIG encoded Distinguished name",
+ "An error occurred during processing of an Encrypted[Data|Key] node",
+diff --git a/xsec/samples/simpleHMAC.cpp b/xsec/samples/simpleHMAC.cpp
+index 1fab6aa..0ef639f 100644
+--- a/xsec/samples/simpleHMAC.cpp
++++ b/xsec/samples/simpleHMAC.cpp
+@@ -156,7 +156,7 @@ int main (int argc, char **argv) {
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during a signature load\n Message: "
++ cerr << "An error occurred during a signature load\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+
+diff --git a/xsec/samples/simpleValidate.cpp b/xsec/samples/simpleValidate.cpp
+index 31a6821..91875fc 100644
+--- a/xsec/samples/simpleValidate.cpp
++++ b/xsec/samples/simpleValidate.cpp
+@@ -245,13 +245,13 @@ int main (int argc, char **argv) {
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during a signature load\n Message: "
++ cerr << "An error occurred during a signature load\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+
+ }
+ catch (XSECCryptoException &e) {
+- cerr << "An error occured in the XML-Security-C Crypto routines\n Message: "
++ cerr << "An error occurred in the XML-Security-C Crypto routines\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+diff --git a/xsec/tools/c14n/c14n.cpp b/xsec/tools/c14n/c14n.cpp
+index 16315cc..28901f3 100644
+--- a/xsec/tools/c14n/c14n.cpp
++++ b/xsec/tools/c14n/c14n.cpp
+@@ -140,7 +140,7 @@ int main(int argc, char **argv) {
+
+ catch (const XMLException& e)
+ {
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << e.getMessage() << endl;
+ errorsOccured = true;
+ }
+@@ -148,7 +148,7 @@ int main(int argc, char **argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+diff --git a/xsec/tools/checksig/checksig.cpp b/xsec/tools/checksig/checksig.cpp
+index 9a6d73a..bdb1557 100644
+--- a/xsec/tools/checksig/checksig.cpp
++++ b/xsec/tools/checksig/checksig.cpp
+@@ -356,7 +356,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (const XMLException& e)
+ {
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << e.getMessage() << endl;
+ errorsOccured = true;
+ }
+@@ -364,7 +364,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+@@ -530,14 +530,14 @@ int evaluate(int argc, char ** argv) {
+
+ catch (XSECException &e) {
+ char * msg = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during signature verification\n Message: "
++ cerr << "An error occurred during signature verification\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ errorsOccured = true;
+ return 2;
+ }
+ catch (XSECCryptoException &e) {
+- cerr << "An error occured during signature verification\n Message: "
++ cerr << "An error occurred during signature verification\n Message: "
+ << e.getMsg() << endl;
+ errorsOccured = true;
+
+@@ -555,7 +555,7 @@ int evaluate(int argc, char ** argv) {
+ #if 0
+ catch (...) {
+
+- cerr << "Unknown Exception type occured. Cleaning up and exiting\n" << endl;
++ cerr << "Unknown Exception type occurred. Cleaning up and exiting\n" << endl;
+
+ return 2;
+
+diff --git a/xsec/tools/cipher/cipher.cpp b/xsec/tools/cipher/cipher.cpp
+index e78102c..26c2556 100644
+--- a/xsec/tools/cipher/cipher.cpp
++++ b/xsec/tools/cipher/cipher.cpp
+@@ -582,7 +582,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (const XMLException& e)
+ {
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << e.getMessage() << endl;
+ errorsOccured = true;
+ }
+@@ -590,7 +590,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+@@ -801,7 +801,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (XSECException &e) {
+ char * msg = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during encryption/decryption operation\n Message: "
++ cerr << "An error occurred during encryption/decryption operation\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ errorsOccured = true;
+@@ -811,7 +811,7 @@ int evaluate(int argc, char ** argv) {
+ return 2;
+ }
+ catch (XSECCryptoException &e) {
+- cerr << "An error occured during encryption/decryption operation\n Message: "
++ cerr << "An error occurred during encryption/decryption operation\n Message: "
+ << e.getMsg() << endl;
+ errorsOccured = true;
+ if (formatTarget != NULL)
+diff --git a/xsec/tools/siginf/siginf.cpp b/xsec/tools/siginf/siginf.cpp
+index 090ffbc..8fab22b 100644
+--- a/xsec/tools/siginf/siginf.cpp
++++ b/xsec/tools/siginf/siginf.cpp
+@@ -437,7 +437,7 @@ int evaluate(int argc, char ** argv) {
+ catch (const XMLException& e)
+ {
+ char * msg = XMLString::transcode(e.getMessage());
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ errorsOccured = true;
+@@ -446,7 +446,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+@@ -499,7 +499,7 @@ int evaluate(int argc, char ** argv) {
+
+ catch (XSECException &e) {
+ char * msg = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during signature loading\n Message: "
++ cerr << "An error occurred during signature loading\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ errorsOccured = true;
+@@ -507,7 +507,7 @@ int evaluate(int argc, char ** argv) {
+ }
+ catch (...) {
+
+- cerr << "Unknown Exception type occured. Cleaning up and exiting\n" << endl;
++ cerr << "Unknown Exception type occurred. Cleaning up and exiting\n" << endl;
+ return 2;
+
+ }
+diff --git a/xsec/tools/templatesign/templatesign.cpp b/xsec/tools/templatesign/templatesign.cpp
+index 6574c52..bbe5dea 100644
+--- a/xsec/tools/templatesign/templatesign.cpp
++++ b/xsec/tools/templatesign/templatesign.cpp
+@@ -1112,7 +1112,7 @@ int main(int argc, char **argv) {
+
+ catch (const XMLException& e)
+ {
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << e.getMessage() << endl;
+ errorsOccured = true;
+ }
+@@ -1120,7 +1120,7 @@ int main(int argc, char **argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+@@ -1323,7 +1323,7 @@ int main(int argc, char **argv) {
+
+ catch (XSECException &e) {
+ char * m = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during signing operation\n Message: "
++ cerr << "An error occurred during signing operation\n Message: "
+ << m << endl;
+ XSEC_RELEASE_XMLCH(m);
+ errorsOccured = true;
+@@ -1331,7 +1331,7 @@ int main(int argc, char **argv) {
+ }
+
+ catch (XSECCryptoException &e) {
+- cerr << "A cryptographic error occured during signature operation\n Message: "
++ cerr << "A cryptographic error occurred during signature operation\n Message: "
+ << e.getMsg() << endl;
+ errorsOccured = true;
+ exit(1);
+diff --git a/xsec/tools/txfmout/txfmout.cpp b/xsec/tools/txfmout/txfmout.cpp
+index 719efb4..a06e2ad 100644
+--- a/xsec/tools/txfmout/txfmout.cpp
++++ b/xsec/tools/txfmout/txfmout.cpp
+@@ -446,7 +446,7 @@ int main(int argc, char **argv) {
+
+ catch (const XMLException& e)
+ {
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << e.getMessage() << endl;
+ errorsOccured = true;
+ }
+@@ -454,7 +454,7 @@ int main(int argc, char **argv) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+@@ -572,7 +572,7 @@ int main(int argc, char **argv) {
+
+ catch (XSECException &e) {
+ char * m = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during signature processing\n Message: "
++ cerr << "An error occurred during signature processing\n Message: "
+ << m << endl;
+ XSEC_RELEASE_XMLCH(m);
+ errorsOccured = true;
+diff --git a/xsec/tools/xklient/xklient.cpp b/xsec/tools/xklient/xklient.cpp
+index 6e6b93c..158a14c 100644
+--- a/xsec/tools/xklient/xklient.cpp
++++ b/xsec/tools/xklient/xklient.cpp
+@@ -3831,13 +3831,13 @@ int doParsedMsgDump(DOMDocument * doc) {
+
+ catch (XSECException &e) {
+ char * msg = XMLString::transcode(e.getMsg());
+- cerr << "An error occured during message loading\n Message: "
++ cerr << "An error occurred during message loading\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ return 2;
+ }
+ catch (XSECCryptoException &e) {
+- cerr << "An error occured during encryption/signature processing\n Message: "
++ cerr << "An error occurred during encryption/signature processing\n Message: "
+ << e.getMsg() << endl;
+
+ #if defined (XSEC_HAVE_OPENSSL)
+@@ -3853,7 +3853,7 @@ int doParsedMsgDump(DOMDocument * doc) {
+ }
+ catch (...) {
+
+- cerr << "Unknown Exception type occured. Cleaning up and exitting\n" << endl;
++ cerr << "Unknown Exception type occurred. Cleaning up and exitting\n" << endl;
+ return 2;
+
+ }
+@@ -4448,7 +4448,7 @@ int doMsgDump(int argc, char ** argv, int paramCount) {
+ catch (const XMLException& e)
+ {
+ char * msg = XMLString::transcode(e.getMessage());
+- cerr << "An error occured during parsing\n Message: "
++ cerr << "An error occurred during parsing\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+ errorsOccured = true;
+@@ -4457,7 +4457,7 @@ int doMsgDump(int argc, char ** argv, int paramCount) {
+
+ catch (const DOMException& e)
+ {
+- cerr << "A DOM error occured during parsing\n DOMException code: "
++ cerr << "A DOM error occurred during parsing\n DOMException code: "
+ << e.code << endl;
+ errorsOccured = true;
+ }
+diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
+index d8f4c6c..c4ace7d 100644
+--- a/xsec/tools/xtest/xtest.cpp
++++ b/xsec/tools/xtest/xtest.cpp
+@@ -559,7 +559,7 @@ bool reValidateSig(DOMImplementation *impl, DOMDocument * inDoc, XSECCryptoKey *
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -568,7 +568,7 @@ bool reValidateSig(DOMImplementation *impl, DOMDocument * inDoc, XSECCryptoKey *
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -671,7 +671,7 @@ void unitTestEnvelopingSignature(DOMImplementation * impl) {
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -680,7 +680,7 @@ void unitTestEnvelopingSignature(DOMImplementation * impl) {
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -784,7 +784,7 @@ void unitTestBase64NodeSignature(DOMImplementation * impl) {
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -793,7 +793,7 @@ void unitTestBase64NodeSignature(DOMImplementation * impl) {
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -954,7 +954,7 @@ void unitTestLongSHA(DOMImplementation * impl) {
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -963,7 +963,7 @@ void unitTestLongSHA(DOMImplementation * impl) {
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1065,7 +1065,7 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -1074,7 +1074,7 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1571,7 +1571,7 @@ count(ancestor-or-self::dsig:Signature)");
+
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -1580,7 +1580,7 @@ count(ancestor-or-self::dsig:Signature)");
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1677,7 +1677,7 @@ void unitTestCipherReference(DOMImplementation * impl) {
+ catch (XSECException &e)
+ {
+ cerr << "failed\n";
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -1687,7 +1687,7 @@ void unitTestCipherReference(DOMImplementation * impl) {
+ catch (XSECCryptoException &e)
+ {
+ cerr << "failed\n";
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1787,7 +1787,7 @@ void unitTestElementContentEncrypt(DOMImplementation *impl, XSECCryptoKey * key,
+ }
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during encryption processing\n Message: ";
++ cerr << "An error occurred during encryption processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -1796,7 +1796,7 @@ void unitTestElementContentEncrypt(DOMImplementation *impl, XSECCryptoKey * key,
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during encryption processing\n Message: "
++ cerr << "A cryptographic error occurred during encryption processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1896,7 +1896,7 @@ void unitTestSmallElement(DOMImplementation *impl) {
+ }
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during encryption processing\n Message: ";
++ cerr << "An error occurred during encryption processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -1905,7 +1905,7 @@ void unitTestSmallElement(DOMImplementation *impl) {
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during encryption processing\n Message: "
++ cerr << "A cryptographic error occurred during encryption processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -1991,7 +1991,7 @@ void unitTestKeyEncrypt(DOMImplementation *impl, XSECCryptoKey * k, encryptionMe
+ catch (XSECException &e)
+ {
+ cerr << "failed\n";
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -2001,7 +2001,7 @@ void unitTestKeyEncrypt(DOMImplementation *impl, XSECCryptoKey * k, encryptionMe
+ catch (XSECCryptoException &e)
+ {
+ cerr << "failed\n";
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -2195,7 +2195,7 @@ void unitTestEncrypt(DOMImplementation *impl) {
+ catch (XSECCryptoException &e)
+ {
+ cerr << "failed\n";
+- cerr << "A cryptographic error occured during encryption unit tests\n Message: "
++ cerr << "A cryptographic error occurred during encryption unit tests\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+@@ -2445,7 +2445,7 @@ void testEncrypt(DOMImplementation *impl) {
+ }
+ catch (XSECException &e)
+ {
+- cerr << "An error occured during signature processing\n Message: ";
++ cerr << "An error occurred during signature processing\n Message: ";
+ char * ce = XMLString::transcode(e.getMsg());
+ cerr << ce << endl;
+ delete ce;
+@@ -2454,7 +2454,7 @@ void testEncrypt(DOMImplementation *impl) {
+ }
+ catch (XSECCryptoException &e)
+ {
+- cerr << "A cryptographic error occured during signature processing\n Message: "
++ cerr << "A cryptographic error occurred during signature processing\n Message: "
+ << e.getMsg() << endl;
+ exit(1);
+ }
+diff --git a/xsec/transformers/TXFMParser.cpp b/xsec/transformers/TXFMParser.cpp
+index abccda7..a38b166 100644
+--- a/xsec/transformers/TXFMParser.cpp
++++ b/xsec/transformers/TXFMParser.cpp
+@@ -123,7 +123,7 @@ void TXFMParser::setInput(TXFMBase *newInput) {
+ parser.parse(is);
+ xsecsize_t errorCount = parser.getErrorCount();
+ if (errorCount > 0)
+- throw XSECException(XSECException::XSLError, "Errors occured parsing BYTE STREAM");
++ throw XSECException(XSECException::XSLError, "Errors occurred parsing BYTE STREAM");
+
+ mp_parsedDoc = parser.adoptDocument();
+
+diff --git a/xsec/transformers/TXFMXSL.cpp b/xsec/transformers/TXFMXSL.cpp
+index e22aeec..ebe9693 100644
+--- a/xsec/transformers/TXFMXSL.cpp
++++ b/xsec/transformers/TXFMXSL.cpp
+@@ -203,7 +203,7 @@ void TXFMXSL::evaluateStyleSheet(const safeBuffer &sbStyleSheet) {
+ parser->parse(*memIS);
+ errorCount = parser->getErrorCount();
+ if (errorCount > 0)
+- throw XSECException(XSECException::XSLError, "Errors occured when XSL result was parsed back to DOM_Nodes");
++ throw XSECException(XSECException::XSLError, "Errors occurred when XSL result was parsed back to DOM_Nodes");
+
+ docOut = parser->adoptDocument();
+
+diff --git a/xsec/xenc/impl/XENCCipherImpl.cpp b/xsec/xenc/impl/XENCCipherImpl.cpp
+index 136c6aa..7f586a9 100644
+--- a/xsec/xenc/impl/XENCCipherImpl.cpp
++++ b/xsec/xenc/impl/XENCCipherImpl.cpp
+@@ -313,7 +313,7 @@ DOMDocumentFragment * XENCCipherImpl::deSerialise(safeBuffer &content, DOMNode *
+ parser.parse(memIS);
+ xsecsize_t errorCount = parser.getErrorCount();
+ if (errorCount > 0)
+- throw XSECException(XSECException::CipherError, "Errors occured during de-serialisation of decrypted element content");
++ throw XSECException(XSECException::CipherError, "Errors occurred during de-serialisation of decrypted element content");
+
+ DOMDocument * doc = parser.getDocument();
+
diff --git a/debian/patches/Remove-superfluous-extern-keyword.patch b/debian/patches/Remove-superfluous-extern-keyword.patch
new file mode 100644
index 0000000..01e5e76
--- /dev/null
+++ b/debian/patches/Remove-superfluous-extern-keyword.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 23:29:18 +0100
+Subject: Remove superfluous extern keyword
+
+---
+ xsec/enc/XSECCryptoException.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xsec/enc/XSECCryptoException.cpp b/xsec/enc/XSECCryptoException.cpp
+index cbe0bf4..1b68d8b 100644
+--- a/xsec/enc/XSECCryptoException.cpp
++++ b/xsec/enc/XSECCryptoException.cpp
+@@ -33,7 +33,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-extern const char * XSECCryptoExceptionStrings[] = {
++const char * XSECCryptoExceptionStrings[] = {
+
+ "No Error",
+ "General error occurred somewhere in cryptographic routines",
diff --git a/debian/patches/Remove-unused-dereferences.patch b/debian/patches/Remove-unused-dereferences.patch
new file mode 100644
index 0000000..f01f96f
--- /dev/null
+++ b/debian/patches/Remove-unused-dereferences.patch
@@ -0,0 +1,112 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:30:22 +0100
+Subject: Remove unused dereferences
+
+---
+ xsec/utils/XSECDOMUtils.cpp | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/xsec/utils/XSECDOMUtils.cpp b/xsec/utils/XSECDOMUtils.cpp
+index 848923d..4937434 100644
+--- a/xsec/utils/XSECDOMUtils.cpp
++++ b/xsec/utils/XSECDOMUtils.cpp
+@@ -492,14 +492,14 @@ XMLCh * encodeDName(const XMLCh * toEncode) {
+ // Find where the trailing whitespace starts
+ const XMLCh * ws = &toEncode[XMLString::stringLen(toEncode)];
+
+- *ws--;
++ ws--;
+ while (ws != toEncode &&
+ (*ws == '\t' || *ws == '\r' || *ws ==' ' || *ws == '\n'))
+- *ws--;
++ ws--;
+
+ // Set to first white space character, if we didn't get back to the start
+ if (toEncode != ws)
+- *ws++;
++ ws++;
+
+ // Now run through each character and encode if necessary
+
+@@ -537,9 +537,9 @@ XMLCh * encodeDName(const XMLCh * toEncode) {
+
+ // Determine if this is an RDN separator
+ const XMLCh *j = i;
+- *j++;
++ j++;
+ while (*j != chComma && *j != chEqual && *j != chNull)
+- *j++;
++ j++;
+
+ if (*j != chEqual)
+ result.sbXMLChAppendCh(chBackSlash);
+@@ -564,7 +564,7 @@ XMLCh * encodeDName(const XMLCh * toEncode) {
+
+ }
+
+- *i++;
++ i++;
+
+ }
+
+@@ -576,7 +576,7 @@ XMLCh * encodeDName(const XMLCh * toEncode) {
+ else
+ result.sbXMLChAppendCh(*i);
+
+- *i++;
++ i++;
+
+ }
+
+@@ -603,8 +603,8 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+ if (*i == chBackSlash && i[1] == chPound) {
+
+ result.sbXMLChAppendCh(chPound);
+- *i++;
+- *i++;
++ i++;
++ i++;
+
+ }
+
+@@ -612,11 +612,11 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+
+ if (*i == chBackSlash) {
+
+- *i++;
++ i++;
+
+ if (*i == chDigit_0) {
+
+- *i++;
++ i++;
+
+ if (*i >= chDigit_0 && *i <= chDigit_9) {
+ result.sbXMLChAppendCh(*i - chDigit_0);
+@@ -635,7 +635,7 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+
+ else if (*i == chDigit_1) {
+
+- *i++;
++ i++;
+
+ if (*i >= chDigit_0 && *i <= chDigit_9) {
+ result.sbXMLChAppendCh(16 + *i - chDigit_0);
+@@ -654,7 +654,7 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+
+ else if (*i == chDigit_2) {
+
+- *i++;
++ i++;
+
+ if (*i == '0') {
+ result.sbXMLChAppendCh(' ');
+@@ -685,7 +685,7 @@ XMLCh * decodeDName(const XMLCh * toDecode) {
+
+ }
+
+- *i++;
++ i++;
+
+ }
+
diff --git a/debian/patches/Remove-unused-variable-1.patch b/debian/patches/Remove-unused-variable-1.patch
new file mode 100644
index 0000000..05d6fb6
--- /dev/null
+++ b/debian/patches/Remove-unused-variable-1.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 22:12:45 +0100
+Subject: Remove unused variable 1
+
+---
+ xsec/dsig/DSIGAlgorithmHandlerDefault.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
+index 779e29d..e60b84c 100644
+--- a/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
++++ b/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
+@@ -93,8 +93,7 @@ bool compareBase64StringToRaw(const char * b64Str,
+ d.rem = 0;
+ d.quot = 0;
+
+- unsigned int maxCompareBytes, maxCompareBits;
+- maxCompareBits = 0;
++ unsigned int maxCompareBytes;
+
+ unsigned int size;
+
diff --git a/debian/patches/Remove-unused-variable-2.patch b/debian/patches/Remove-unused-variable-2.patch
new file mode 100644
index 0000000..eb1cf27
--- /dev/null
+++ b/debian/patches/Remove-unused-variable-2.patch
@@ -0,0 +1,86 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 00:50:48 +0100
+Subject: Remove unused variable 2
+
+---
+ xsec/tools/xtest/xtest.cpp | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
+index ec40cb2..d8f4c6c 100644
+--- a/xsec/tools/xtest/xtest.cpp
++++ b/xsec/tools/xtest/xtest.cpp
+@@ -985,7 +985,6 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
+ XSECProvider prov;
+ DSIGSignature *sig;
+ DOMElement *sigNode;
+- DSIGReference *ref[4];
+
+ sig = prov.newSignature();
+ sig->setDSIGNSPrefix(MAKE_UNICODE_STRING("ds"));
+@@ -1005,10 +1004,6 @@ void unitTestRSASig(DOMImplementation * impl, XSECCryptoKeyRSA * k, const XMLCh
+ DOMText * txt= doc->createTextNode(MAKE_UNICODE_STRING("A test string"));
+ obj->appendChild(txt);
+
+- // Add a Reference
+- ref[0] = sig->createReference(MAKE_UNICODE_STRING("#ObjectId"),
+- DSIGConstants::s_unicodeStrURISHA1);
+-
+ // Get a key
+ cerr << "signing ... ";
+
+@@ -2545,7 +2540,6 @@ int main(int argc, char **argv) {
+ bool doEncryptionUnitTests = true;
+ bool doSignatureTest = true;
+ bool doSignatureUnitTests = true;
+- bool doXKMSTest = true;
+
+ int paramCount = 1;
+
+@@ -2576,28 +2570,24 @@ int main(int argc, char **argv) {
+ doEncryptionTest = false;
+ doEncryptionUnitTests = false;
+ doSignatureUnitTests = false;
+- doXKMSTest = false;
+ paramCount++;
+ }
+ else if (_stricmp(argv[paramCount], "--encryption-only") == 0 || _stricmp(argv[paramCount], "-e") == 0) {
+ doSignatureTest = false;
+ doEncryptionUnitTests = false;
+ doSignatureUnitTests = false;
+- doXKMSTest = false;
+ paramCount++;
+ }
+ else if (_stricmp(argv[paramCount], "--encryption-unit-only") == 0 || _stricmp(argv[paramCount], "-u") == 0) {
+ doEncryptionTest = false;
+ doSignatureTest = false;
+ doSignatureUnitTests = false;
+- doXKMSTest = false;
+ paramCount++;
+ }
+ else if (_stricmp(argv[paramCount], "--signature-unit-only") == 0 || _stricmp(argv[paramCount], "-t") == 0) {
+ doEncryptionTest = false;
+ doSignatureTest = false;
+ doEncryptionUnitTests = false;
+- doXKMSTest = false;
+ paramCount++;
+ }
+ /* else if (stricmp(argv[paramCount], "--xkms-only") == 0 || stricmp(argv[paramCount], "-x") == 0) {
+@@ -2723,17 +2713,6 @@ int main(int argc, char **argv) {
+
+ unitTestEncrypt(impl);
+ }
+-/*
+- // Running XKMS Base test
+- if (doXKMSTest) {
+- cerr << endl << "====================================";
+- cerr << endl << "Performing XKMS Function";
+- cerr << endl << "====================================";
+- cerr << endl << endl;
+-
+- testXKMS(impl);
+- }
+-*/
+ cerr << endl << "All tests passed" << endl;
+
+ }
diff --git a/debian/patches/Remove-unused-variable-3.patch b/debian/patches/Remove-unused-variable-3.patch
new file mode 100644
index 0000000..d79a1b4
--- /dev/null
+++ b/debian/patches/Remove-unused-variable-3.patch
@@ -0,0 +1,34 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 31 Jan 2016 01:02:08 +0100
+Subject: Remove unused variable 3
+
+---
+ xsec/tools/xklient/xklient.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/xsec/tools/xklient/xklient.cpp b/xsec/tools/xklient/xklient.cpp
+index 68ce39c..6e6b93c 100644
+--- a/xsec/tools/xklient/xklient.cpp
++++ b/xsec/tools/xklient/xklient.cpp
+@@ -3812,7 +3812,6 @@ int doParsedMsgDump(DOMDocument * doc) {
+ // Get an XKMS Message Factory
+ XSECProvider prov;
+ XKMSMessageFactory * factory = prov.getXKMSMessageFactory();
+- int errorsOccured;
+
+ try {
+
+@@ -3835,13 +3834,11 @@ int doParsedMsgDump(DOMDocument * doc) {
+ cerr << "An error occured during message loading\n Message: "
+ << msg << endl;
+ XSEC_RELEASE_XMLCH(msg);
+- errorsOccured = true;
+ return 2;
+ }
+ catch (XSECCryptoException &e) {
+ cerr << "An error occured during encryption/signature processing\n Message: "
+ << e.getMsg() << endl;
+- errorsOccured = true;
+
+ #if defined (XSEC_HAVE_OPENSSL)
+ ERR_load_crypto_strings();
diff --git a/debian/patches/TXFMOutputFile-close-output-file-only-if-it-s-open.patch b/debian/patches/TXFMOutputFile-close-output-file-only-if-it-s-open.patch
new file mode 100644
index 0000000..4d69718
--- /dev/null
+++ b/debian/patches/TXFMOutputFile-close-output-file-only-if-it-s-open.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 23:40:38 +0100
+Subject: TXFMOutputFile: close output file only if it's open
+
+---
+ xsec/transformers/TXFMOutputFile.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xsec/transformers/TXFMOutputFile.cpp b/xsec/transformers/TXFMOutputFile.cpp
+index 04542bd..f0c8681 100644
+--- a/xsec/transformers/TXFMOutputFile.cpp
++++ b/xsec/transformers/TXFMOutputFile.cpp
+@@ -36,10 +36,10 @@ XERCES_CPP_NAMESPACE_USE
+
+ TXFMOutputFile::~TXFMOutputFile() {
+
+- if (f.is_open())
++ if (f.is_open()) {
+ f.write("\n----- END -----\n", 17);
+ f.close();
+-
++ }
+ }
+
+ // Methods to set the inputs
diff --git a/debian/patches/Use-the-z-length-modifier-for-printing-size_t.patch b/debian/patches/Use-the-z-length-modifier-for-printing-size_t.patch
new file mode 100644
index 0000000..60141a4
--- /dev/null
+++ b/debian/patches/Use-the-z-length-modifier-for-printing-size_t.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 23:56:04 +0100
+Subject: Use the z length modifier for printing size_t
+
+---
+ xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp b/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
+index af9940b..36b578a 100644
+--- a/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
++++ b/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
+@@ -183,7 +183,7 @@ DOMDocument * XSECSOAPRequestorSimple::doRequest(DOMDocument * request) {
+
+ strcat(fBuffer, "Content-Length: ");
+ int i = (int) strlen(fBuffer);
+- sprintf(fBuffer+i, "%d", strlen(content));
++ sprintf(fBuffer+i, "%zu", strlen(content));
+ strcat(fBuffer, "\r\n");
+ strcat(fBuffer, "SOAPAction: \"\"\r\n");
+
diff --git a/debian/patches/loadX509PEM-fix-potential-reading-past-unterminated-.patch b/debian/patches/loadX509PEM-fix-potential-reading-past-unterminated-.patch
new file mode 100644
index 0000000..69d8e17
--- /dev/null
+++ b/debian/patches/loadX509PEM-fix-potential-reading-past-unterminated-.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 30 Jan 2016 23:11:00 +0100
+Subject: loadX509PEM: fix potential reading past unterminated buffer
+
+---
+ xsec/enc/XSECCryptoX509.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xsec/enc/XSECCryptoX509.cpp b/xsec/enc/XSECCryptoX509.cpp
+index f87f746..2682e70 100644
+--- a/xsec/enc/XSECCryptoX509.cpp
++++ b/xsec/enc/XSECCryptoX509.cpp
+@@ -46,7 +46,7 @@ void XSECCryptoX509::loadX509PEM(const char * buf, unsigned int len) {
+ b = b1;
+ }
+
+- const char *p = strstr(buf, "-----BEGIN CERTIFICATE-----");
++ const char *p = strstr(b, "-----BEGIN CERTIFICATE-----");
+
+ if (p == NULL) {
+
diff --git a/debian/patches/series b/debian/patches/series
index 5d0991a..7946b5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,20 @@
Add-xsec-prefix-to-utilities.patch
Avoid-forward-incompatibility-warnings-from-Automake.patch
+Fix-GCC6-FTBFS.patch
+Fix-GCC5-warnings.patch
+Fix-indentation-1.patch
+Remove-unused-variable-1.patch
+loadX509PEM-fix-potential-reading-past-unterminated-.patch
+Remove-superfluous-extern-keyword.patch
+TXFMOutputFile-close-output-file-only-if-it-s-open.patch
+Use-the-z-length-modifier-for-printing-size_t.patch
+Remove-unused-dereferences.patch
+Don-t-compute-unused-variables.patch
+Fix-indentation-2.patch
+Fix-indentation-3.patch
+Remove-unused-variable-2.patch
+Fix-indentation-4.patch
+Remove-unused-variable-3.patch
+Fix-indentation-5.patch
+Avoid-GCC-warning-suggesting-parentheses.patch
+Fix-typo-occured-occurred.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xml-security-c.git
More information about the Pkg-shibboleth-devel
mailing list