-/*\r
- * Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * EncryptedKeyResolver.cpp\r
- * \r
- * SAML-specific encrypted key resolver \r
- */\r
- \r
-#include "internal.h"\r
-#include "encryption/EncryptedKeyResolver.h"\r
-\r
-using namespace xmlencryption;\r
-using namespace std;\r
-\r
-EncryptedKey* opensaml::EncryptedKeyResolver::resolveKey(EncryptedData* encryptedData)\r
-{\r
- const vector<EncryptedKey*>& keys=m_ref.getEncryptedKeys();\r
- for (vector<EncryptedKey*>::const_iterator i=keys.begin(); i!=keys.end(); i++) {\r
- if (XMLString::equals(m_recipient,(*i)->getRecipient()))\r
- return (*i);\r
- }\r
- return NULL;\r
-}\r
+/*
+ * Copyright 2001-2007 Internet2
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * EncryptedKeyResolver.cpp
+ *
+ * SAML-specific encrypted key resolver
+ */
+
+#include "internal.h"
+#include "encryption/EncryptedKeyResolver.h"
+#include "saml2/core/Assertions.h"
+
+using namespace xmlencryption;
+using namespace std;
+
+const EncryptedKey* opensaml::EncryptedKeyResolver::resolveKey(const EncryptedData& encryptedData, const XMLCh* recipient) const
+{
+ const EncryptedKey* base = xmlencryption::EncryptedKeyResolver::resolveKey(encryptedData, recipient);
+ if (base)
+ return base;
+
+ const vector<EncryptedKey*>& keys=m_ref.getEncryptedKeys();
+ for (vector<EncryptedKey*>::const_iterator i=keys.begin(); i!=keys.end(); i++) {
+ if (XMLString::equals(recipient,(*i)->getRecipient()))
+ return (*i);
+ }
+ return NULL;
+}