Set fourth file version digit to signify rebuild.

[shibboleth/cpp-xmltooling.git] / xmltooling / encryption / EncryptedKeyResolver.h

diff --git a/xmltooling/encryption/EncryptedKeyResolver.h b/xmltooling/encryption/EncryptedKeyResolver.h
index 01dcf85..40a1901 100644 (file)
--- a/xmltooling/encryption/EncryptedKeyResolver.h
+++ b/xmltooling/encryption/EncryptedKeyResolver.h
@@ -1,49 +1,55 @@
-/*\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
- * @file EncryptedKeyResolver.h\r
- * \r
- * Resolves encrypted keys based on EncryptedData information or other external factors.\r
- */\r
-\r
-#if !defined(__xmltooling_enckeyres_h__) && !defined(XMLTOOLING_NO_XMLSEC)\r
-#define __xmltooling_enckeyres_h__\r
-\r
-#include <xmltooling/encryption/Encryption.h>\r
-#include <xmltooling/signature/KeyResolver.h>\r
-\r
-namespace xmlencryption {\r
-\r
-    /**\r
-     * An API for resolving encrypted decryption keys.\r
-     */\r
-    class XMLTOOL_API EncryptedKeyResolver : public xmlsignature::KeyResolver {\r
-    public:\r
-        virtual ~EncryptedKeyResolver() {}\r
-        \r
-        /**\r
-         * Returns an encrypted key based on the supplied KeyInfo information.\r
-         * \r
-         * @param encryptedData an encrypted object\r
-         * @return  the resolved EncryptedKey object\r
-         */\r
-        virtual EncryptedKey* resolveKey(EncryptedData* encryptedData)=0;\r
-    };\r
-\r
-};\r
-\r
-#endif /* __xmltooling_enckeyres_h__ */\r
+/**
+ * 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
+ *
+ * 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 xmltooling/encryption/EncryptedKeyResolver.h
+ * 
+ * Resolves encrypted keys based on EncryptedData information or other external factors.
+ */
+
+#if !defined(__xmltooling_enckeyres_h__) && !defined(XMLTOOLING_NO_XMLSEC)
+#define __xmltooling_enckeyres_h__
+
+#include <xmltooling/encryption/Encryption.h>
+
+namespace xmlencryption {
+
+    /**
+     * An API for resolving encrypted decryption keys.
+     */
+    class XMLTOOL_API EncryptedKeyResolver {
+        MAKE_NONCOPYABLE(EncryptedKeyResolver);
+    public:
+        EncryptedKeyResolver();
+        virtual ~EncryptedKeyResolver();
+        
+        /**
+         * Returns an encrypted key based on the supplied object's KeyInfo information.
+         * 
+         * @param encryptedData an encrypted object
+         * @param recipient identifier of recipient of encrypted key
+         * @return  the resolved EncryptedKey object
+         */
+        virtual const EncryptedKey* resolveKey(const EncryptedData& encryptedData, const XMLCh* recipient=nullptr) const;
+    };
+
+};
+
+#endif /* __xmltooling_enckeyres_h__ */