|
@@ -1292,6 +1292,7 @@ static void __fastcall ConvertKey(UnicodeString & FileName, TKeyType Type)
|
|
//---------------------------------------------------------------------------
|
|
//---------------------------------------------------------------------------
|
|
void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message, TStrings *& MoreMessages, UnicodeString & HelpKeyword)
|
|
void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message, TStrings *& MoreMessages, UnicodeString & HelpKeyword)
|
|
{
|
|
{
|
|
|
|
+ std::unique_ptr<TStrings> AMoreMessages;
|
|
if (!FileName.Trim().IsEmpty())
|
|
if (!FileName.Trim().IsEmpty())
|
|
{
|
|
{
|
|
FileName = ExpandEnvironmentVariables(FileName);
|
|
FileName = ExpandEnvironmentVariables(FileName);
|
|
@@ -1300,7 +1301,6 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
|
|
int Error = errno;
|
|
int Error = errno;
|
|
HelpKeyword = HELP_LOGIN_KEY_TYPE;
|
|
HelpKeyword = HELP_LOGIN_KEY_TYPE;
|
|
UnicodeString PuttygenPath;
|
|
UnicodeString PuttygenPath;
|
|
- std::unique_ptr<TStrings> AMoreMessages;
|
|
|
|
switch (Type)
|
|
switch (Type)
|
|
{
|
|
{
|
|
case ktOpenSSHPEM:
|
|
case ktOpenSSHPEM:
|
|
@@ -1361,9 +1361,8 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
|
|
Message = MainInstructions(FMTLOAD(KEY_TYPE_UNKNOWN2, (FileName)));
|
|
Message = MainInstructions(FMTLOAD(KEY_TYPE_UNKNOWN2, (FileName)));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
-
|
|
|
|
- MoreMessages = AMoreMessages.release();
|
|
|
|
}
|
|
}
|
|
|
|
+ MoreMessages = AMoreMessages.release();
|
|
}
|
|
}
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
//---------------------------------------------------------------------------
|