[opensaml2] 01/11: Replace xsecsize_t with XMLSize_t
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:08:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository opensaml2.
commit 760c3c708a83ef4c17d9bb7c9781c7e4ac32badd
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Wed Sep 13 12:18:36 2017 -0400
Replace xsecsize_t with XMLSize_t
---
saml/binding/impl/SAMLArtifact.cpp | 6 +++---
saml/binding/impl/SimpleSigningRule.cpp | 4 ++--
saml/saml1/binding/impl/SAML1POSTDecoder.cpp | 2 +-
saml/saml1/binding/impl/SAML1POSTEncoder.cpp | 2 +-
saml/saml2/binding/impl/SAML2POSTDecoder.cpp | 2 +-
saml/saml2/binding/impl/SAML2POSTEncoder.cpp | 4 ++--
saml/saml2/binding/impl/SAML2RedirectDecoder.cpp | 2 +-
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp | 2 +-
saml/saml2/metadata/impl/MetadataImpl.cpp | 4 ++--
saml/util/CommonDomainCookie.cpp | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/saml/binding/impl/SAMLArtifact.cpp b/saml/binding/impl/SAMLArtifact.cpp
index cd1c43c..f2e9750 100644
--- a/saml/binding/impl/SAMLArtifact.cpp
+++ b/saml/binding/impl/SAMLArtifact.cpp
@@ -79,7 +79,7 @@ SAMLArtifact::SAMLArtifact(const SAMLArtifact& src) : m_raw(src.m_raw)
SAMLArtifact::SAMLArtifact(const char* s)
{
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(s),&len);
if (!decoded)
throw ArtifactException("Unable to decode base64 artifact.");
@@ -110,7 +110,7 @@ string SAMLArtifact::getRemainingArtifact() const
string SAMLArtifact::encode() const
{
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* out=Base64::encode(reinterpret_cast<const XMLByte*>(m_raw.data()),m_raw.size(),&len);
if (out) {
string ret(reinterpret_cast<char*>(out),len);
@@ -127,7 +127,7 @@ string SAMLArtifact::encode() const
SAMLArtifact* SAMLArtifact::parse(const char* s)
{
// Decode and extract the type code first.
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(s),&len);
if (!decoded)
throw ArtifactException("Artifact parser unable to decode base64-encoded artifact.");
diff --git a/saml/binding/impl/SimpleSigningRule.cpp b/saml/binding/impl/SimpleSigningRule.cpp
index ee46c11..f9d6dce 100644
--- a/saml/binding/impl/SimpleSigningRule.cpp
+++ b/saml/binding/impl/SimpleSigningRule.cpp
@@ -151,7 +151,7 @@ bool SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
// Serializing the XMLObject doesn't guarantee the signature will verify (this is
// why XMLSignature exists, and why this isn't really "simpler").
- xsecsize_t x;
+ XMLSize_t x;
pch = httpRequest->getParameter("SAMLRequest");
if (pch) {
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(pch),&x);
@@ -191,7 +191,7 @@ bool SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest*
KeyInfo* keyInfo=nullptr;
pch = request->getParameter("KeyInfo");
if (pch) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(pch),&x);
if (decoded) {
try {
diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index 773a2bc..c559fc5 100644
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -97,7 +97,7 @@ XMLObject* SAML1POSTDecoder::decode(
relayState = TARGET;
// Decode the base64 into XML.
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(samlResponse),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST profile response.");
diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
index 5086cea..7ce4811 100644
--- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
@@ -163,7 +163,7 @@ long SAML1POSTEncoder::encode(
log.debug("marshalled response:\n%s", xmlbuf.c_str());
// Replace with base-64 encoded version.
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* out=Base64::encode(reinterpret_cast<const XMLByte*>(xmlbuf.data()),xmlbuf.size(),&len);
if (out) {
xmlbuf.erase();
diff --git a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index e873d8f..24c5eb4 100644
--- a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@ -101,7 +101,7 @@ XMLObject* SAML2POSTDecoder::decode(
relayState.erase();
// Decode the base64 into SAML.
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in POST binding message.");
diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
index 7d388fd..6905f48 100644
--- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
@@ -193,7 +193,7 @@ long SAML2POSTEncoder::encode(
if (keyInfo.get()) {
string& kstring = pmap.m_map["KeyInfo"];
XMLHelper::serialize(keyInfo->marshall((DOMDocument*)nullptr), kstring);
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* out=Base64::encode(reinterpret_cast<const XMLByte*>(kstring.data()),kstring.size(),&len);
if (!out)
throw BindingException("Base64 encoding of XML failed.");
@@ -208,7 +208,7 @@ long SAML2POSTEncoder::encode(
}
// Base64 the message.
- xsecsize_t len=0;
+ XMLSize_t len=0;
XMLByte* out=Base64::encode(reinterpret_cast<const XMLByte*>(msg.data()),msg.size(),&len);
if (!out)
throw BindingException("Base64 encoding of XML failed.");
diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index 485fa88..0fb0910 100644
--- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@ -104,7 +104,7 @@ XMLObject* SAML2RedirectDecoder::decode(
}
// Decode the compressed message into SAML. First we base64-decode it.
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
if (!decoded)
throw BindingException("Unable to decode base64 in Redirect binding message.");
diff --git a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
index 604abbc..7b37a9a 100644
--- a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
@@ -135,7 +135,7 @@ long SAML2RedirectEncoder::encode(
if (!deflated)
throw BindingException("Failed to deflate message.");
- xsecsize_t xlen;
+ XMLSize_t xlen;
XMLByte* encoded=Base64::encode(reinterpret_cast<XMLByte*>(deflated), len, &xlen);
delete[] deflated;
if (!encoded)
diff --git a/saml/saml2/metadata/impl/MetadataImpl.cpp b/saml/saml2/metadata/impl/MetadataImpl.cpp
index 58c3b19..dfba13e 100644
--- a/saml/saml2/metadata/impl/MetadataImpl.cpp
+++ b/saml/saml2/metadata/impl/MetadataImpl.cpp
@@ -938,8 +938,8 @@ namespace opensaml {
return true;
if (m_ProtocolSupportEnumeration) {
// Look for first character.
- xsecsize_t len=XMLString::stringLen(protocol);
- xsecsize_t pos=0;
+ XMLSize_t len=XMLString::stringLen(protocol);
+ XMLSize_t pos=0;
int index=XMLString::indexOf(m_ProtocolSupportEnumeration,protocol[0],pos);
while (index>=0) {
// Only possible match is if it's the first character or a space comes before it.
diff --git a/saml/util/CommonDomainCookie.cpp b/saml/util/CommonDomainCookie.cpp
index 23b15ef..f1a481c 100644
--- a/saml/util/CommonDomainCookie.cpp
+++ b/saml/util/CommonDomainCookie.cpp
@@ -57,7 +57,7 @@ CommonDomainCookie::CommonDomainCookie(const char* cookie)
m_list.erase(remove(m_list.begin(), m_list.end(), ""), m_list.end());
// Now Base64 decode the list elements, overwriting them.
- xsecsize_t len;
+ XMLSize_t len;
for (vector<string>::iterator i = m_list.begin(); i != m_list.end(); ++i) {
trim(*i);
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(i->c_str()),&len);
@@ -90,7 +90,7 @@ const char* CommonDomainCookie::set(const char* entityID)
m_list.push_back(entityID);
// Now rebuild the delimited list.
- xsecsize_t len;
+ XMLSize_t len;
string delimited;
for (vector<string>::const_iterator j = m_list.begin(); j != m_list.end(); ++j) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git
More information about the Pkg-shibboleth-devel
mailing list