Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / encryption / EncryptedKeyResolver.cpp

diff --git a/saml/encryption/EncryptedKeyResolver.cpp b/saml/encryption/EncryptedKeyResolver.cpp
index 8831717..c25e528 100644 (file)
--- a/saml/encryption/EncryptedKeyResolver.cpp
+++ b/saml/encryption/EncryptedKeyResolver.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * EncryptedKeyResolver.cpp
  * 
- * SAML-specific encrypted key resolver 
+ * SAML-specific encrypted key resolver.
  */
  
 #include "internal.h"
@@ -25,14 +25,27 @@
 #include "saml2/core/Assertions.h"
 
 using namespace xmlencryption;
+using opensaml::saml2::EncryptedElementType;
 using namespace std;
 
+opensaml::EncryptedKeyResolver::EncryptedKeyResolver(const EncryptedElementType& ref) : m_ref(ref)
+{
+}
+
+opensaml::EncryptedKeyResolver::~EncryptedKeyResolver()
+{
+}
+
 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;
+    return nullptr;
 }