Credential management revised

lib/TLS/include/Credentials.h

@@ -30,6 +30,8 @@ namespace eap
 
 #pragma once
 
+#include "Config.h"
+
 #include "../../EAPBase/include/Credentials.h"
 
 #include <WinStd/Crypt.h>
@@ -183,7 +185,25 @@ namespace eap
         ///
         virtual winstd::tstring get_name() 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_tls   *cred_cached,
+            _In_       const config_method_tls &cfg,
+            _In_opt_z_       LPCTSTR           pszTargetName);
 
     public:
         winstd::cert_context m_cert;    ///< Client certificate

lib/TLS/include/Method.h

@@ -539,5 +539,8 @@ namespace eap
         EAP_ATTRIBUTES m_eap_attr_desc;                         ///< EAP Radius attributes descriptor
         std::vector<winstd::eap_attr> m_eap_attr;               ///< EAP Radius attributes
         BYTE *m_blob_cfg;                                       ///< Configuration BLOB
+#ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
+        BYTE *m_blob_cred;                                      ///< Credentials BLOB
+#endif
     };
 }