Change license header, remove stale pkg files.

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

diff --git a/saml/encryption/EncryptedKeyResolver.h b/saml/encryption/EncryptedKeyResolver.h
index 8063c1c..fed683f 100644 (file)
--- a/saml/encryption/EncryptedKeyResolver.h
+++ b/saml/encryption/EncryptedKeyResolver.h
@@ -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.
  */
 
 /**
  * @file saml/encryption/EncryptedKeyResolver.h
  * 
- * SAML-specific encrypted key resolver 
+ * SAML-specific encrypted key resolver.
  */
 
 #ifndef __saml_enckeyres_h__
@@ -41,14 +45,19 @@ namespace opensaml {
     class SAML_API EncryptedKeyResolver : public xmlencryption::EncryptedKeyResolver
     {
     public:
-        EncryptedKeyResolver(const saml2::EncryptedElementType& ref) : m_ref(ref) {
-        }
+        /**
+         * Constructor.
+         * 
+         * @param ref   reference to encrypted element
+         */
+        EncryptedKeyResolver(const saml2::EncryptedElementType& ref);
         
-        virtual ~EncryptedKeyResolver() {}
+        virtual ~EncryptedKeyResolver();
 
-        const xmlencryption::EncryptedKey* resolveKey(const xmlencryption::EncryptedData& encryptedData, const XMLCh* recipient=NULL) const;
+        const xmlencryption::EncryptedKey* resolveKey(const xmlencryption::EncryptedData& encryptedData, const XMLCh* recipient=nullptr) const;
      
     protected:
+        /** Reference to encrypted element. */
         const saml2::EncryptedElementType& m_ref;
     };