[shibboleth-sp2] 61/82: Replace xsecsize_t with XMLSize_t
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit 8e8eadc8fc63abf12c63166de969b4ed1e514404
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Wed Sep 13 12:22:09 2017 -0400
Replace xsecsize_t with XMLSize_t
---
iis7_shib/NativeRequest.cpp | 2 +-
isapi_shib/isapi_shib.cpp | 2 +-
plugins/GSSAPIAttributeExtractor.cpp | 2 +-
shibsp/attribute/Base64AttributeDecoder.cpp | 6 +++---
shibsp/attribute/BinaryAttribute.cpp | 4 ++--
shibsp/attribute/XMLAttribute.cpp | 2 +-
shibsp/handler/impl/RemotedHandler.cpp | 8 ++++----
shibsp/handler/impl/SAML2SessionInitiator.cpp | 2 +-
shibsp/lite/CommonDomainCookie.cpp | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/iis7_shib/NativeRequest.cpp b/iis7_shib/NativeRequest.cpp
index 6ec655c..926ba11 100644
--- a/iis7_shib/NativeRequest.cpp
+++ b/iis7_shib/NativeRequest.cpp
@@ -211,7 +211,7 @@ const vector<string>& NativeRequest::getClientCertificates() const
if (nullptr == certInfo) {
return m_certs;
}
- xsecsize_t outlen;
+ XMLSize_t outlen;
XMLByte* serialized = Base64::encode(reinterpret_cast<XMLByte*>(certInfo->pCertEncoded), certInfo->CertEncodedSize, &outlen);
m_certs.push_back(reinterpret_cast<char*>(serialized));
#ifdef SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE
diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp
index 33fbd16..3ced9e8 100644
--- a/isapi_shib/isapi_shib.cpp
+++ b/isapi_shib/isapi_shib.cpp
@@ -1002,7 +1002,7 @@ public:
if (m_lpECB->ServerSupportFunction(m_lpECB->ConnID, HSE_REQ_GET_CERT_INFO_EX, (LPVOID)&ccex, (LPDWORD)dwSize, nullptr)) {
if (ccex.CertContext.cbCertEncoded) {
- xsecsize_t outlen;
+ XMLSize_t outlen;
XMLByte* serialized = Base64::encode(reinterpret_cast<XMLByte*>(CertificateBuf), ccex.CertContext.cbCertEncoded, &outlen);
m_certs.push_back(reinterpret_cast<char*>(serialized));
#ifdef SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE
diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp
index a405eae..e17ccac 100644
--- a/plugins/GSSAPIAttributeExtractor.cpp
+++ b/plugins/GSSAPIAttributeExtractor.cpp
@@ -341,7 +341,7 @@ void GSSAPIExtractor::extractAttributes(
return;
}
- xsecsize_t x;
+ XMLSize_t x;
OM_uint32 major,minor;
auto_ptr_char encoded(encodedWide);
diff --git a/shibsp/attribute/Base64AttributeDecoder.cpp b/shibsp/attribute/Base64AttributeDecoder.cpp
index e86e6be..1de5017 100644
--- a/shibsp/attribute/Base64AttributeDecoder.cpp
+++ b/shibsp/attribute/Base64AttributeDecoder.cpp
@@ -111,7 +111,7 @@ shibsp::Attribute* Base64AttributeDecoder::decode(
if (!(*valrange.first)->hasChildren()) {
auto_ptr_char val((*valrange.first)->getTextContent());
if (val.get() && *val.get()) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(val.get()),&x);
if (decoded) {
dest.push_back(reinterpret_cast<char*>(decoded));
@@ -144,7 +144,7 @@ shibsp::Attribute* Base64AttributeDecoder::decode(
}
auto_ptr_char val(saml2name->getName());
if (val.get() && *val.get()) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(val.get()),&x);
if (decoded) {
dest.push_back(reinterpret_cast<char*>(decoded));
@@ -173,7 +173,7 @@ shibsp::Attribute* Base64AttributeDecoder::decode(
}
auto_ptr_char val(saml1name->getName());
if (val.get() && *val.get()) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(val.get()),&x);
if (decoded) {
dest.push_back(reinterpret_cast<char*>(decoded));
diff --git a/shibsp/attribute/BinaryAttribute.cpp b/shibsp/attribute/BinaryAttribute.cpp
index 7e870e8..d7dc443 100644
--- a/shibsp/attribute/BinaryAttribute.cpp
+++ b/shibsp/attribute/BinaryAttribute.cpp
@@ -44,7 +44,7 @@ BinaryAttribute::BinaryAttribute(const vector<string>& ids) : Attribute(ids)
BinaryAttribute::BinaryAttribute(DDF& in) : Attribute(in)
{
- xsecsize_t x;
+ XMLSize_t x;
DDF val = in.first().first();
while (val.string()) {
m_serialized.push_back(val.string());
@@ -99,7 +99,7 @@ void BinaryAttribute::removeValue(size_t index)
const vector<string>& BinaryAttribute::getSerializedValues() const
{
- xsecsize_t len;
+ XMLSize_t len;
XMLByte *pos, *pos2;
if (m_serialized.empty()) {
for (vector<string>::const_iterator i=m_values.begin(); i!=m_values.end(); ++i) {
diff --git a/shibsp/attribute/XMLAttribute.cpp b/shibsp/attribute/XMLAttribute.cpp
index fc4f863..536635c 100644
--- a/shibsp/attribute/XMLAttribute.cpp
+++ b/shibsp/attribute/XMLAttribute.cpp
@@ -93,7 +93,7 @@ void XMLAttribute::removeValue(size_t index)
const vector<string>& XMLAttribute::getSerializedValues() const
{
- xsecsize_t len;
+ XMLSize_t len;
XMLByte *pos, *pos2;
if (m_serialized.empty()) {
for (vector<string>::const_iterator i=m_values.begin(); i!=m_values.end(); ++i) {
diff --git a/shibsp/handler/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
index 529682a..12ff92b 100644
--- a/shibsp/handler/impl/RemotedHandler.cpp
+++ b/shibsp/handler/impl/RemotedHandler.cpp
@@ -227,7 +227,7 @@ gss_ctx_id_t RemotedRequest::getGSSContext() const
if (m_gssctx == GSS_C_NO_CONTEXT) {
const char* encoded = m_input["gss_context"].string();
if (encoded) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded = Base64::decode(reinterpret_cast<const XMLByte*>(encoded), &x);
if (decoded) {
gss_buffer_desc importbuf;
@@ -253,7 +253,7 @@ gss_name_t RemotedRequest::getGSSName() const
if (m_gssname == GSS_C_NO_NAME) {
const char* encoded = m_input["gss_name"].string();
if (encoded) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded = Base64::decode(reinterpret_cast<const XMLByte*>(encoded), &x);
gss_buffer_desc importbuf;
importbuf.length = x;
@@ -422,7 +422,7 @@ DDF RemotedHandler::wrap(const SPRequest& request, const vector<string>* headers
gss_buffer_desc contextbuf = GSS_C_EMPTY_BUFFER;
OM_uint32 major = gss_export_sec_context(&minor, &ctx, &contextbuf);
if (major == GSS_S_COMPLETE) {
- xsecsize_t len = 0;
+ XMLSize_t len = 0;
XMLByte* out = Base64::encode(reinterpret_cast<const XMLByte*>(contextbuf.value), contextbuf.length, &len);
gss_release_buffer(&minor, &contextbuf);
if (out) {
@@ -451,7 +451,7 @@ DDF RemotedHandler::wrap(const SPRequest& request, const vector<string>* headers
gss_buffer_desc namebuf = GSS_C_EMPTY_BUFFER;
OM_uint32 major = gss_export_name_composite(&minor, name, &namebuf);
if (major == GSS_S_COMPLETE) {
- xsecsize_t len = 0;
+ XMLSize_t len = 0;
XMLByte* out = Base64::encode(reinterpret_cast<const XMLByte*>(namebuf.value), namebuf.length, &len);
gss_release_buffer(&minor, &namebuf);
if (out) {
diff --git a/shibsp/handler/impl/SAML2SessionInitiator.cpp b/shibsp/handler/impl/SAML2SessionInitiator.cpp
index 577aff0..9ad3a57 100644
--- a/shibsp/handler/impl/SAML2SessionInitiator.cpp
+++ b/shibsp/handler/impl/SAML2SessionInitiator.cpp
@@ -648,7 +648,7 @@ pair<bool,long> SAML2SessionInitiator::doRequest(
auto_ptr<AuthnRequest> req;
if (requestTemplate) {
- xsecsize_t x;
+ XMLSize_t x;
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(requestTemplate), &x);
if (decoded) {
istringstream is(reinterpret_cast<char*>(decoded));
diff --git a/shibsp/lite/CommonDomainCookie.cpp b/shibsp/lite/CommonDomainCookie.cpp
index d963af4..99e8399 100644
--- a/shibsp/lite/CommonDomainCookie.cpp
+++ b/shibsp/lite/CommonDomainCookie.cpp
@@ -59,7 +59,7 @@ CommonDomainCookie::CommonDomainCookie(const char* cookie)
free(b64);
// Now Base64 decode the list.
- xsecsize_t len;
+ XMLSize_t len;
for (vector<string>::iterator i=templist.begin(); i!=templist.end(); ++i) {
XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(i->c_str()),&len);
if (decoded && *decoded) {
@@ -96,7 +96,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++) {
if (!delimited.empty()) delimited += ' ';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list