Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

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

diff --git a/xmltooling/security/impl/KeyInfoResolver.cpp b/xmltooling/security/impl/KeyInfoResolver.cpp
index dda9367..869949f 100644 (file)
--- a/xmltooling/security/impl/KeyInfoResolver.cpp
+++ b/xmltooling/security/impl/KeyInfoResolver.cpp
@@ -1,23 +1,27 @@
-/*
- *  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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
+ * 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.
+ * 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.
  */
 
 /**
  * KeyInfoResolver.cpp
  * 
- * Registration of factories for built-in resolvers
+ * Resolves credentials from KeyInfo information.
  */
 
 #include "internal.h"
@@ -30,7 +34,7 @@ using namespace xmltooling;
 using namespace std;
 
 namespace xmltooling {
-    XMLTOOL_DLLLOCAL PluginManager<KeyInfoResolver,const DOMElement*>::Factory InlineKeyInfoResolverFactory;
+    XMLTOOL_DLLLOCAL PluginManager<KeyInfoResolver,string,const xercesc::DOMElement*>::Factory InlineKeyInfoResolverFactory;
 };
 
 void XMLTOOL_API xmltooling::registerKeyInfoResolvers()
@@ -39,13 +43,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 +66,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;
 }