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 (parent:
9424cba
)
Convert usage bits to a mask.
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 17 Oct 2007 06:20:51 +0000
(06:20 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 17 Oct 2007 06:20:51 +0000
(06:20 +0000)
saml/saml2/metadata/MetadataCredentialCriteria.h
patch
|
blob
|
history
diff --git
a/saml/saml2/metadata/MetadataCredentialCriteria.h
b/saml/saml2/metadata/MetadataCredentialCriteria.h
index
4aa54b8
..
7d57810
100644
(file)
--- a/
saml/saml2/metadata/MetadataCredentialCriteria.h
+++ b/
saml/saml2/metadata/MetadataCredentialCriteria.h
@@
-64,10
+64,10
@@
namespace opensaml {
const MetadataCredentialContext* context = dynamic_cast<const MetadataCredentialContext*>(credential.getCredentalContext());
if (context) {
// Check for a usage mismatch.
const MetadataCredentialContext* context = dynamic_cast<const MetadataCredentialContext*>(credential.getCredentalContext());
if (context) {
// Check for a usage mismatch.
- if ((getUsage()
==xmltooling::Credential::SIGNING_CREDENTIAL || getUsage()==xmltooling::Credential::TLS_CREDENTIAL
) &&
+ if ((getUsage()
| (xmltooling::Credential::SIGNING_CREDENTIAL & xmltooling::Credential::TLS_CREDENTIAL)
) &&
XMLString::equals(context->getKeyDescriptor().getUse(),KeyDescriptor::KEYTYPE_ENCRYPTION))
return false;
XMLString::equals(context->getKeyDescriptor().getUse(),KeyDescriptor::KEYTYPE_ENCRYPTION))
return false;
- else if (
getUsage()==xmltooling::Credential::ENCRYPTION_CREDENTIAL
&&
+ else if (
(getUsage() | xmltooling::Credential::ENCRYPTION_CREDENTIAL)
&&
XMLString::equals(context->getKeyDescriptor().getUse(),KeyDescriptor::KEYTYPE_SIGNING))
return false;
}
XMLString::equals(context->getKeyDescriptor().getUse(),KeyDescriptor::KEYTYPE_SIGNING))
return false;
}