Credential management revised

lib/PAP/include/Credentials.h

@@ -28,6 +28,8 @@ namespace eap
 
 #pragma once
 
+#include "Config.h"
+
 #include "../../EAPBase/include/Credentials.h"
 
 #include <Windows.h>
@@ -95,5 +97,25 @@ namespace eap
         virtual LPCTSTR target_suffix() const;
 
         /// @}
+
+        ///
+        /// Combine credentials in the following order:
+        ///
+        /// 1. Cached credentials
+        /// 2. Pre-configured credentials
+        /// 3. Stored credentials
+        ///
+        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL)
+        /// \param[in] cfg            Method configuration
+        /// \param[in] pszTargetName  The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        ///
+        /// \returns
+        /// - \c true  if credentials were set;
+        /// - \c false otherwise
+        ///
+        bool combine(
+            _In_       const credentials_pap   *cred_cached,
+            _In_       const config_method_pap &cfg,
+            _In_opt_z_       LPCTSTR           pszTargetName);
     };
 }