projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
46ac496
)
Header and STL fixes.
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 11 May 2007 06:31:18 +0000
(06:31 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 11 May 2007 06:31:18 +0000
(06:31 +0000)
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
patch
|
blob
|
history
saml/util/CGIParser.cpp
patch
|
blob
|
history
samltest/encryption/EncryptedAssertionTest.h
patch
|
blob
|
history
samltest/signature/SAMLSignatureTestBase.h
patch
|
blob
|
history
diff --git
a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
index
104e3bb
..
70e3f5d
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
@@
-149,7
+149,7
@@
long SAML2RedirectEncoder::encode(
// Generate redirect.
log.debug("message encoded, sending redirect to client");
// Generate redirect.
log.debug("message encoded, sending redirect to client");
- xmlbuf.insert(
0,
1,(strchr(destination,'?') ? '&' : '?'));
+ xmlbuf.insert(
(string::size_type)0,(string::size_type)
1,(strchr(destination,'?') ? '&' : '?'));
xmlbuf.insert(0,destination);
long ret = httpResponse->sendRedirect(xmlbuf.c_str());
xmlbuf.insert(0,destination);
long ret = httpResponse->sendRedirect(xmlbuf.c_str());
diff --git
a/saml/util/CGIParser.cpp
b/saml/util/CGIParser.cpp
index
b668643
..
666a5b8
100644
(file)
--- a/
saml/util/CGIParser.cpp
+++ b/
saml/util/CGIParser.cpp
@@
-48,7
+48,7
@@
CGIParser::CGIParser(const HTTPRequest& request)
plustospace(value);
dec->decode(value);
name=makeword(value,'=');
plustospace(value);
dec->decode(value);
name=makeword(value,'=');
- kvp_map.insert(pair<string,char*>(name,value));
+ kvp_map.insert(pair<
const
string,char*>(name,value));
free(name);
}
}
free(name);
}
}
diff --git
a/samltest/encryption/EncryptedAssertionTest.h
b/samltest/encryption/EncryptedAssertionTest.h
index
70eb860
..
ef959dc
100644
(file)
--- a/
samltest/encryption/EncryptedAssertionTest.h
+++ b/
samltest/encryption/EncryptedAssertionTest.h
@@
-17,6
+17,7
@@
#include "signature/SAMLSignatureTestBase.h"
#include <fstream>
#include "signature/SAMLSignatureTestBase.h"
#include <fstream>
+#include <sstream>
#include <saml/SAMLConfig.h>
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/SAMLConfig.h>
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
@@
-116,7
+117,9
@@
public:
const SPSSODescriptor* sprole = sp->getSPSSODescriptor(samlconstants::SAML20P_NS);
TSM_ASSERT("No SP role for recipient.", sprole!=NULL);
MetadataCredentialCriteria mcc(*sprole);
const SPSSODescriptor* sprole = sp->getSPSSODescriptor(samlconstants::SAML20P_NS);
TSM_ASSERT("No SP role for recipient.", sprole!=NULL);
MetadataCredentialCriteria mcc(*sprole);
- vector< pair<const MetadataProvider*,MetadataCredentialCriteria*> > recipients(1, make_pair(m_metadata, &mcc));
+ vector< pair<const MetadataProvider*,MetadataCredentialCriteria*> > recipients(
+ 1, pair<const MetadataProvider*,MetadataCredentialCriteria*>(m_metadata, &mcc)
+ );
encrypted->encrypt(*assertion.get(), recipients);
// Roundtrip it.
encrypted->encrypt(*assertion.get(), recipients);
// Roundtrip it.
diff --git
a/samltest/signature/SAMLSignatureTestBase.h
b/samltest/signature/SAMLSignatureTestBase.h
index
3c8d8ce
..
aa6c290
100644
(file)
--- a/
samltest/signature/SAMLSignatureTestBase.h
+++ b/
samltest/signature/SAMLSignatureTestBase.h
@@
-15,8
+15,9
@@
*/
#include "internal.h"
*/
#include "internal.h"
-#include <saml/signature/SignatureProfileValidator.h>
+#include <sstream>
+#include <saml/signature/SignatureProfileValidator.h>
#include <xmltooling/security/CredentialCriteria.h>
#include <xmltooling/security/CredentialResolver.h>
#include <xmltooling/signature/KeyInfo.h>
#include <xmltooling/security/CredentialCriteria.h>
#include <xmltooling/security/CredentialResolver.h>
#include <xmltooling/signature/KeyInfo.h>