From 4630b32f77c630210414ac5adc1548816c9cd1c8 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 19 Jul 2016 13:39:41 +0200
Subject: [PATCH] target_suffix() method is private now

---
 lib/EAPBase/include/Credentials.h | 16 +++++++++++-----
 lib/PAP/include/Credentials.h     |  1 +
 lib/TLS/include/Credentials.h     |  8 +++++++-
 lib/TLS/src/Credentials.cpp       |  6 ++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lib/EAPBase/include/Credentials.h b/lib/EAPBase/include/Credentials.h
index 6152bc2..a7fb9fa 100644
--- a/lib/EAPBase/include/Credentials.h
+++ b/lib/EAPBase/include/Credentials.h
@@ -215,11 +215,6 @@ namespace eap
         ///
         virtual bool retrieve(_In_ LPCTSTR pszTargetName, _Out_ EAP_ERROR **ppEapError) = 0;
 
-        ///
-        /// Return target suffix for Windows Credential Manager credential name
-        ///
-        virtual LPCTSTR target_suffix() const = 0;
-
         ///
         /// Returns target name for Windows Credential Manager credential name
         ///
@@ -239,6 +234,17 @@ namespace eap
 
         /// @}
 
+    protected:
+        /// \name Storage
+        /// @{
+
+        ///
+        /// Return target suffix for Windows Credential Manager credential name
+        ///
+        virtual LPCTSTR target_suffix() const = 0;
+
+        /// @}
+
     public:
         std::wstring m_identity;    ///< Identity (username\@domain, certificate name etc.)
     };
diff --git a/lib/PAP/include/Credentials.h b/lib/PAP/include/Credentials.h
index d158664..e9a8f08 100644
--- a/lib/PAP/include/Credentials.h
+++ b/lib/PAP/include/Credentials.h
@@ -117,6 +117,7 @@ namespace eap
         ///
         virtual config* clone() const;
 
+    protected:
         /// \name Storage
         /// @{
 
diff --git a/lib/TLS/include/Credentials.h b/lib/TLS/include/Credentials.h
index ca8f61a..e797690 100644
--- a/lib/TLS/include/Credentials.h
+++ b/lib/TLS/include/Credentials.h
@@ -185,10 +185,16 @@ namespace eap
         ///
         virtual bool retrieve(_In_ LPCTSTR pszTargetName, _Out_ EAP_ERROR **ppEapError);
 
+        /// @}
+
+    protected:
+        /// \name Storage
+        /// @{
+
         ///
         /// Return target suffix for Windows Credential Manager credential name
         ///
-        virtual LPCTSTR target_suffix() const { return _T("TLS"); }
+        virtual LPCTSTR target_suffix() const;
 
         /// @}
 
diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp
index 55dd48b..860ebe1 100644
--- a/lib/TLS/src/Credentials.cpp
+++ b/lib/TLS/src/Credentials.cpp
@@ -247,6 +247,12 @@ bool eap::credentials_tls::retrieve(_In_ LPCTSTR pszTargetName, _Out_ EAP_ERROR
 }
 
 
+LPCTSTR eap::credentials_tls::target_suffix() const
+{
+    return _T("TLS");
+}
+
+
 const unsigned char eap::credentials_tls::s_entropy[1024] = {
     0xb9, 0xd1, 0x62, 0xd4, 0x1c, 0xe6, 0x8c, 0x25, 0x98, 0x9b, 0x1d, 0xbc, 0x40, 0x46, 0x9e, 0x6d,
     0x63, 0xba, 0xda, 0x78, 0x65, 0x56, 0x97, 0x4f, 0xa0, 0x89, 0xf4, 0xc5, 0x1b, 0xf5, 0x8d, 0x69,