colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In examine-encryption mode, say 'Unknown' & exit w/ nonzero value if can't find a keyfile that goes with the file being examined

This commit is contained in:
Brian Cox 2017-07-08 15:18:58 -07:00
parent 4176c1db12
commit 122010acc2
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/twadmin/twadmincl.cpp
View File

@ -45,6 +45,7 @@
#include "core/usernotify.h" #include "core/usernotify.h"
#include "core/cmdlineparser.h" #include "core/cmdlineparser.h"
#include "core/usernotify.h" #include "core/usernotify.h"
#include "core/corestrings.h"
#include "fco/fconame.h" #include "fco/fconame.h"
#include "tw/configfile.h" #include "tw/configfile.h"
#include "tw/twutil.h" #include "tw/twutil.h"
@ -1553,15 +1554,19 @@ int cTWAModeExamine::Execute(cErrorQueue* pQueue)
// Try different keys to see if they decrypt this file // Try different keys to see if they decrypt this file
if (manip.GetEncoding() == cFileHeader::ASYM_ENCRYPTION) if (manip.GetEncoding() == cFileHeader::ASYM_ENCRYPTION)
{ {
bool bFound = false;
// Output the keys that decrypt the file. // Output the keys that decrypt the file.
iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTWAdmin, twadmin::STR_KEYS_DECRYPT ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTWAdmin, twadmin::STR_KEYS_DECRYPT ).c_str());
iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTW, tw::STR_NEWLINE ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_NORMAL, TSS_GetString(cTW, tw::STR_NEWLINE ).c_str());
if (siteKey.KeysLoaded()) if (siteKey.KeysLoaded())
try try
{ {
if (manip.TestDecryption(*siteKey.GetPublicKey(), false) != false) if (manip.TestDecryption(*siteKey.GetPublicKey(), false) != false)
{ {
bFound = true;
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_SITEKEYFILE ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_SITEKEYFILE ).c_str());
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mSiteKeyFile ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mSiteKeyFile ).c_str());
@ -1575,6 +1580,8 @@ int cTWAModeExamine::Execute(cErrorQueue* pQueue)
{ {
if (manip.TestDecryption(*localKey.GetPublicKey(), false) != false) if (manip.TestDecryption(*localKey.GetPublicKey(), false) != false)
{ {
bFound = true;
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_LOCALKEYFILE ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTWAdmin, twadmin::STR_LOCALKEYFILE ).c_str());
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mLocalKeyFile ).c_str()); iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, cDisplayEncoder::EncodeInline( mLocalKeyFile ).c_str());
@ -1582,6 +1589,15 @@ int cTWAModeExamine::Execute(cErrorQueue* pQueue)
} }
} }
catch (eError&) {} catch (eError&) {}
if (!bFound)
{
bResult = false;
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, "\t");
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cCore, core::STR_UNKNOWN).c_str());
iUserNotify::GetInstance()->Notify(iUserNotify::V_SILENT, TSS_GetString(cTW, tw::STR_NEWLINE ).c_str());
}
} }
TCOUT << std::endl; TCOUT << std::endl;
} }