Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

eap::get_cert_title() moved from TLS_UI to TLS

Browse Source
This commit is contained in:
Simon Rozman
2016-07-19 12:03:02 +02:00
parent 0ee9bade32
commit faea2f3771
4 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/TLS_UI/include/TLS_UI.h
View File

@@ -27,8 +27,8 @@
#include <wx/filedlg.h>
#include <wx/msgdlg.h>
#include <cryptuiapi.h>
#include <Windows.h>
#include <cryptuiapi.h>
#include <WinCrypt.h> // Must include after <Windows.h>
#include <list>
@@ -75,14 +75,6 @@ template <class _Tprov> class wxEAPTLSCredentialsConfigPanel;
///
template <class _Tprov> class wxEAPTLSConfigPanel;
namespace eap
{
///
/// Helper function to compile human-readable certificate name for UI display
///
void get_cert_title(PCCERT_CONTEXT cert, winstd::tstring &title);
}
#pragma once
#include "../res/wxTLS_UI.h"
@@ -297,8 +289,7 @@ protected:
m_cred.m_cert &&
m_cred.m_cert->cbCertEncoded == data->m_cert->cbCertEncoded &&
memcmp(m_cred.m_cert->pbCertEncoded, data->m_cert->pbCertEncoded, m_cred.m_cert->cbCertEncoded) == 0;
winstd::tstring name;
eap::get_cert_title(cert, name);
winstd::tstring name(std::move(eap::get_cert_title(cert)));
int i = m_cert_select_val->Append(name, data.release());
if (is_selected) {
m_cert_select_val->SetSelection(i);