Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / impl / KeyInfoResolver.cpp

diff --git a/xmltooling/security/impl/KeyInfoResolver.cpp b/xmltooling/security/impl/KeyInfoResolver.cpp
index 6b182f8..649e3e0 100644 (file)
--- a/xmltooling/security/impl/KeyInfoResolver.cpp
+++ b/xmltooling/security/impl/KeyInfoResolver.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 @@
 /**
  * KeyInfoResolver.cpp
  * 
- * Registration of factories for built-in resolvers
+ * Resolves credentials from KeyInfo information.
  */
 
 #include "internal.h"
@@ -30,7 +30,7 @@ using namespace xmltooling;
 using namespace std;
 
 namespace xmltooling {
-    XMLTOOL_DLLLOCAL PluginManager<KeyInfoResolver,string,const DOMElement*>::Factory InlineKeyInfoResolverFactory;
+    XMLTOOL_DLLLOCAL PluginManager<KeyInfoResolver,string,const xercesc::DOMElement*>::Factory InlineKeyInfoResolverFactory;
 };
 
 void XMLTOOL_API xmltooling::registerKeyInfoResolvers()
@@ -39,13 +39,21 @@ void XMLTOOL_API xmltooling::registerKeyInfoResolvers()
     conf.KeyInfoResolverManager.registerFactory(INLINE_KEYINFO_RESOLVER, InlineKeyInfoResolverFactory);
 }
 
+KeyInfoResolver::KeyInfoResolver()
+{
+}
+
+KeyInfoResolver::~KeyInfoResolver()
+{
+}
+
 Credential* KeyInfoResolver::resolve(const Signature* sig, int types) const
 {
     const KeyInfo* keyInfo = sig->getKeyInfo();
     if (keyInfo)
         return resolve(keyInfo, types);
     DSIGSignature* native = sig->getXMLSignature();
-    return resolve(native ? native->getKeyInfoList() : (DSIGKeyInfoList*)NULL, types);
+    return resolve(native ? native->getKeyInfoList() : (DSIGKeyInfoList*)nullptr, types);
 }
 
 Credential* KeyInfoResolver::resolve(const CredentialCriteria& criteria, int types) const
@@ -54,5 +62,5 @@ Credential* KeyInfoResolver::resolve(const CredentialCriteria& criteria, int typ
     if (keyInfo)
         return resolve(keyInfo, types);
     DSIGKeyInfoList* native = criteria.getNativeKeyInfo();
-    return native ? resolve(native, types) : NULL;
+    return native ? resolve(native, types) : nullptr;
 }