nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-24 03:53:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace TrueCrypt references in added sources and resources by VeraCrypt ones.

Browse Source
This commit is contained in:
Mounir IDRASSI 2014-05-31 23:09:24 +02:00
parent 34370b9933
commit edc9f36322
31 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Build/Resources/MacOSX/Info.plist.xml
View File

@ -6,19 +6,19 @@
<string>6.0</string>
<key>CFBundleIdentifier</key>
<string>org.TrueCryptFoundation.TrueCrypt</string>
<string>org.idrix.VeraCrypt</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>TrueCrypt</string>
<string>VeraCrypt</string>
<key>CFBundleIconFile</key>
<string>TrueCrypt.icns</string>
<string>VeraCrypt.icns</string>
<key>CFBundleName</key>
<string>TrueCrypt</string>
<string>VeraCrypt</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
@ -33,7 +33,7 @@
<string>_VERSION_</string>
<key>CFBundleLongVersionString</key>
<string>TrueCrypt _VERSION_</string>
<string>VeraCrypt _VERSION_</string>
<key>LSRequiresCarbon</key>
<true/>

2
src/Core/Unix/CoreService.cpp
View File

@ -357,7 +357,7 @@ namespace TrueCrypt
string appPath = request.ApplicationExecutablePath;
if (appPath.empty())
appPath = "truecrypt";
appPath = "veracrypt";
const char *args[] = { "sudo", "-S", "-p", "", appPath.c_str(), TC_CORE_SERVICE_CMDLINE_OPTION, nullptr };
execvp (args[0], ((char* const*) args));

4
src/Core/Unix/CoreUnix.cpp
View File

@ -210,10 +210,10 @@ namespace TrueCrypt
return envPrefix;
if (FilesystemPath ("/media").IsDirectory())
return "/media/truecrypt";
return "/media/veracrypt";
if (FilesystemPath ("/mnt").IsDirectory())
return "/mnt/truecrypt";
return "/mnt/veracrypt";
return GetTempDirectory() + "/truecrypt_mnt";
}

4
src/Core/Unix/Linux/CoreLinux.cpp
View File

@ -114,7 +114,7 @@ namespace TrueCrypt
{
string devPath = mountedVolume->VirtualDevice;
if (devPath.find ("/dev/mapper/truecrypt") != 0)
if (devPath.find ("/dev/mapper/veracrypt") != 0)
throw NotApplicable (SRC_POS);
size_t devCount = 0;
@ -380,7 +380,7 @@ namespace TrueCrypt
}
stringstream nativeDevName;
nativeDevName << "truecrypt" << options.SlotNumber;
nativeDevName << "veracrypt" << options.SlotNumber;
if (nativeDevCount != cipherCount - 1)
nativeDevName << "_" << cipherCount - nativeDevCount - 2;

2
src/Core/Unix/MacOSX/CoreMacOSX.h
View File

@ -22,7 +22,7 @@ namespace TrueCrypt
virtual void CheckFilesystem (shared_ptr <VolumeInfo> mountedVolume, bool repair = false) const;
virtual shared_ptr <VolumeInfo> DismountVolume (shared_ptr <VolumeInfo> mountedVolume, bool ignoreOpenFiles = false, bool syncVolumeInfo = false);
virtual string GetDefaultMountPointPrefix () const { return "/Volumes/truecrypt"; }
virtual string GetDefaultMountPointPrefix () const { return "/Volumes/veracrypt"; }
protected:
virtual void MountAuxVolumeImage (const DirectoryPath &auxMountPoint, const MountOptions &options) const;

2
src/Driver/Fuse/FuseService.h
View File

@ -43,7 +43,7 @@ namespace TrueCrypt
static int ExceptionToErrorCode ();
static const char *GetControlPath () { return "/control"; }
static const char *GetVolumeImagePath ();
static string GetDeviceType () { return "truecrypt"; }
static string GetDeviceType () { return "veracrypt"; }
static uid_t GetGroupId () { return GroupId; }
static uid_t GetUserId () { return UserId; }
static shared_ptr <Buffer> GetVolumeInfo ();

2
src/Driver/Ntdriver.c
View File

@ -3049,7 +3049,7 @@ BOOL IsVolumeClassFilterRegistered ()
{
if (data->Type == REG_MULTI_SZ && data->DataLength >= 9 * sizeof (wchar_t))
{
// Search for the string "truecrypt"
// Search for the string "veracrypt"
ULONG i;
for (i = 0; i <= data->DataLength - 9 * sizeof (wchar_t); ++i)
{

2
src/Main/Application.cpp
View File

@ -42,7 +42,7 @@ namespace TrueCrypt
if (!Core->IsInPortableMode())
{
#ifdef TC_MACOSX
wxFileName configPath (L"~/Library/Application Support/TrueCrypt");
wxFileName configPath (L"~/Library/Application Support/VeraCrypt");
configPath.Normalize();
configDir = wstring (configPath.GetFullPath());
#else

2
src/Main/Application.h
View File

@ -24,7 +24,7 @@ namespace TrueCrypt
static DirectoryPath GetExecutableDirectory ();
static FilePath GetExecutablePath ();
static int GetExitCode () { return ExitCode; }
static wstring GetName () { return L"TrueCrypt"; }
static wstring GetName () { return L"VeraCrypt"; }
static UserInterface *GetUserInterface () { return mUserInterface; }
static UserInterfaceType::Enum GetUserInterfaceType () { return mUserInterfaceType; }
static void Initialize (UserInterfaceType::Enum type);

2
src/Main/CommandLineInterface.cpp
View File

@ -55,7 +55,7 @@ namespace TrueCrypt
parser.AddSwitch (L"", L"list-token-keyfiles", _("List security token keyfiles"));
parser.AddSwitch (L"", L"load-preferences", _("Load user preferences"));
parser.AddSwitch (L"", L"mount", _("Mount volume interactively"));
parser.AddOption (L"m", L"mount-options", _("TrueCrypt volume mount options"));
parser.AddOption (L"m", L"mount-options", _("VeraCrypt volume mount options"));
parser.AddOption (L"", L"new-keyfiles", _("New keyfiles"));
parser.AddOption (L"", L"new-password", _("New password"));
parser.AddSwitch (L"", L"non-interactive", _("Do not interact with user"));

12
src/Main/FatalErrorHandler.cpp
View File

@ -76,9 +76,9 @@ namespace TrueCrypt
url.Replace (L"=0X0x", L"=0x");
url.Replace (L"=0X", L"=0x");
wxString msg = L"A critical error has occurred and TrueCrypt must be terminated. If this is caused by a bug in TrueCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Hardware architecture\n- Checksum of TrueCrypt executable\n- Error category\n- Error address\n";
wxString msg = L"A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Hardware architecture\n- Checksum of VeraCrypt executable\n- Error category\n- Error address\n";
#if wxUSE_STACKWALKER == 1
msg += L"- TrueCrypt call stack\n";
msg += L"- VeraCrypt call stack\n";
#endif
msg += L"\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n";
@ -198,11 +198,11 @@ namespace TrueCrypt
wxString vars;
wxString exName = StringConverter::ToWide (StringConverter::GetTypeName (typeid (e)));
if (exName.find (L"TrueCrypt::") != string::npos)
if (exName.find (L"VeraCrypt::") != string::npos)
exName = exName.Mid (11);
wxString exPos = StringConverter::ToWide (e.what());
if (exPos.find (L"TrueCrypt::") != string::npos)
if (exPos.find (L"VeraCrypt::") != string::npos)
exPos = exPos.Mid (11);
vars << L"cpus=" << wxThread::GetCPUCount();
@ -219,9 +219,9 @@ namespace TrueCrypt
url.Replace (L"=0X0x", L"=0x");
url.Replace (L"=0X", L"=0x");
wxString msg = L"An unhandled exception has occurred and TrueCrypt must be terminated. If this is caused by a bug in TrueCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Hardware architecture\n- Checksum of TrueCrypt executable\n- Error description\n- Error location\n";
wxString msg = L"An unhandled exception has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Hardware architecture\n- Checksum of VeraCrypt executable\n- Error description\n- Error location\n";
#if wxUSE_STACKWALKER == 1
msg += L"- TrueCrypt call stack\n";
msg += L"- VeraCrypt call stack\n";
#endif
msg += L"\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n";

6
src/Main/Forms/AboutDialog.cpp
View File

@ -25,7 +25,7 @@ namespace TrueCrypt
VersionStaticText->SetLabel (Application::GetName() + L" " + StringConverter::ToWide (Version::String()));
CopyrightStaticText->SetLabel (StringConverter::ToWide (TC_STR_RELEASED_BY));
WebsiteHyperlink->SetLabel (L"www.truecrypt.org");
WebsiteHyperlink->SetLabel (L"www.idrix.fr");
CreditsTextCtrl->SetMinSize (wxSize (
Gui->GetCharWidth (CreditsTextCtrl) * 70,
@ -57,10 +57,10 @@ namespace TrueCrypt
L"Copyright \xA9 1998-2008 Brian Gladman. All Rights Reserved.\n"
L"\nThis software as a whole:\n"
L"Copyright \xA9 2012 TrueCrypt Developers Association. All rights reserved.\n\n"
L"Copyright \xA9 2014 IDRIX. All rights reserved.\n\n"
L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n"
L"A TrueCrypt Foundation Release");
L"An IDRIX Release");
}
}

10
src/Main/Forms/Forms.cpp
View File

@ -168,7 +168,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
HelpMenu->AppendSeparator();
wxMenuItem* WebsiteMenuItem;
WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("VeraCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( WebsiteMenuItem );
wxMenuItem* DownloadsMenuItem;
@ -1654,7 +1654,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
wxStaticBoxSizer* sbSizer14;
sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after VeraCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
@ -1728,7 +1728,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
bSizer62 = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizer18;
sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL );
sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("VeraCrypt Background Task") ), wxVERTICAL );
BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
@ -1772,7 +1772,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start VeraCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
@ -1780,7 +1780,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted VeraCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );

12
src/Main/Forms/Forms.h
View File

@ -147,7 +147,7 @@ namespace TrueCrypt
public:
MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
~MainFrameBase();
};
@ -242,7 +242,7 @@ namespace TrueCrypt
public:
BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~BenchmarkDialogBase();
};
@ -330,7 +330,7 @@ namespace TrueCrypt
public:
EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~EncryptionTestDialogBase();
};
@ -441,7 +441,7 @@ namespace TrueCrypt
wxTextCtrl* LegalNoticesTextCtrl;
public:
LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~LegalNoticesDialogBase();
};
@ -492,7 +492,7 @@ namespace TrueCrypt
public:
MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter VeraCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
~MountOptionsDialogBase();
};
@ -643,7 +643,7 @@ namespace TrueCrypt
public:
RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~RandomPoolEnrichmentDialogBase();
};

2
src/Main/Forms/MainFrame.cpp
View File

@ -1420,7 +1420,7 @@ namespace TrueCrypt
else if (show && !mTaskBarIcon->IsIconInstalled())
{
#ifndef TC_MACOSX
mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"TrueCrypt");
mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"VeraCrypt");
#endif
}
}

2
src/Main/Forms/PreferencesDialog.cpp
View File

@ -114,7 +114,7 @@ namespace TrueCrypt
#ifdef TC_MACOSX
DismountOnScreenSaverCheckBox->Show (false);
DismountOnLogOffCheckBox->SetLabel (_("TrueCrypt quits"));
DismountOnLogOffCheckBox->SetLabel (_("VeraCrypt quits"));
OpenExplorerWindowAfterMountCheckBox->SetLabel (_("Open Finder window for successfully mounted volume"));
MountRemovableCheckBox->Show (false);

26
src/Main/Forms/TrueCrypt.fbp
View File

@ -11,8 +11,8 @@
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">TrueCrypt</property>
<property name="namespace">&quot;TrueCrypt&quot;</property>
<property name="name">VeraCrypt</property>
<property name="namespace">&quot;VeraCrypt&quot;</property>
<property name="path">.</property>
<property name="precompiled_header">#include &quot;System.h&quot;</property>
<property name="relative_path">1</property>
@ -35,7 +35,7 @@
<property name="size">-1,496</property>
<property name="style">wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU</property>
<property name="subclass"></property>
<property name="title">TrueCrypt</property>
<property name="title">VeraCrypt</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
@ -646,7 +646,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">TrueCrypt Website</property>
<property name="label">VeraCrypt Website</property>
<property name="name">WebsiteMenuItem</property>
<property name="permission">none</property>
<property name="shortcut"></property>
@ -3059,7 +3059,7 @@
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">TrueCrypt - Encryption Algorithm Benchmark</property>
<property name="title">VeraCrypt - Encryption Algorithm Benchmark</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
@ -3958,7 +3958,7 @@
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">TrueCrypt - Test Vectors</property>
<property name="title">VeraCrypt - Test Vectors</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
@ -6752,7 +6752,7 @@
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">TrueCrypt - Legal Notices</property>
<property name="title">VeraCrypt - Legal Notices</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
@ -6929,7 +6929,7 @@
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">Enter TrueCrypt Volume Password</property>
<property name="title">Enter VeraCrypt Volume Password</property>
<property name="tooltip"></property>
<property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
<property name="window_name"></property>
@ -9007,7 +9007,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Wipe after TrueCrypt window has been closed</property>
<property name="label">Wipe after VeraCrypt window has been closed</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">WipeCacheOnCloseCheckBox</property>
@ -9544,7 +9544,7 @@
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">TrueCrypt Background Task</property>
<property name="label">VeraCrypt Background Task</property>
<property name="minimum_size"></property>
<property name="name">sbSizer18</property>
<property name="orient">wxVERTICAL</property>
@ -9916,7 +9916,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Start TrueCrypt Background Task</property>
<property name="label">Start VeraCrypt Background Task</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">StartOnLogonCheckBox</property>
@ -10020,7 +10020,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Mount all device-hosted TrueCrypt volumes</property>
<property name="label">Mount all device-hosted VeraCrypt volumes</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">MountDevicesOnLogonCheckBox</property>
@ -11698,7 +11698,7 @@
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">TrueCrypt - Random Pool Enrichment</property>
<property name="title">VeraCrypt - Random Pool Enrichment</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>

6
src/Main/Forms/VolumeCreationWizard.cpp
View File

@ -152,7 +152,7 @@ namespace TrueCrypt
else if (SelectedVolumeType == VolumeType::Hidden)
{
pageTitle = LangString["SIZE_HIDVOL_TITLE"];
pageText = LangString["SIZE_HELP_HIDDEN_VOL"] + L"\n\n" + _("Please note that if your operating system does not allocate files from the beginning of the free space, the maximum possible hidden volume size may be much smaller than the size of the free space on the outer volume. This not a bug in TrueCrypt but a limitation of the operating system.");
pageText = LangString["SIZE_HELP_HIDDEN_VOL"] + L"\n\n" + _("Please note that if your operating system does not allocate files from the beginning of the free space, the maximum possible hidden volume size may be much smaller than the size of the free space on the outer volume. This not a bug in VeraCrypt but a limitation of the operating system.");
freeSpaceText = StringFormatter (_("Maximum possible hidden volume size for this volume is {0}."), Gui->SizeToString (MaxHiddenVolumeSize));
}
else
@ -579,7 +579,7 @@ namespace TrueCrypt
{
if (partition.MountPoint == "/")
{
Gui->ShowError (_("Error: You are trying to encrypt a system drive.\n\nTrueCrypt can encrypt a system drive only under Windows."));
Gui->ShowError (_("Error: You are trying to encrypt a system drive.\n\nVeraCrypt can encrypt a system drive only under Windows."));
return GetCurrentStep();
}
}
@ -614,7 +614,7 @@ namespace TrueCrypt
{
if (mountPoint == "/")
{
Gui->ShowError (_("Error: You are trying to encrypt a system partition.\n\nTrueCrypt can encrypt system partitions only under Windows."));
Gui->ShowError (_("Error: You are trying to encrypt a system partition.\n\nVeraCrypt can encrypt system partitions only under Windows."));
return GetCurrentStep();
}

2
src/Main/Forms/VolumePropertiesDialog.cpp
View File

@ -69,7 +69,7 @@ namespace TrueCrypt
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]);
#ifdef TC_LINUX
if (string (volumeInfo.VirtualDevice).find ("/dev/mapper/truecrypt") != 0)
if (string (volumeInfo.VirtualDevice).find ("/dev/mapper/veracrypt") != 0)
{
#endif
AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead));

10
src/Main/GraphicUserInterface.cpp
View File

@ -860,7 +860,7 @@ namespace TrueCrypt
wxLog::FlushActive();
Application::SetExitCode (1);
Gui->ShowInfo (_("TrueCrypt is already running."));
Gui->ShowInfo (_("VeraCrypt is already running."));
return false;
}
@ -1079,13 +1079,13 @@ namespace TrueCrypt
wxString docPath = wstring (Application::GetExecutableDirectory());
#ifdef TC_RESOURCE_DIR
docPath = StringConverter::ToWide (string (TC_TO_STRING (TC_RESOURCE_DIR)) + "/doc/TrueCrypt User Guide.pdf");
docPath = StringConverter::ToWide (string (TC_TO_STRING (TC_RESOURCE_DIR)) + "/doc/VeraCrypt User Guide.pdf");
#elif defined (TC_WINDOWS)
docPath += L"\\TrueCrypt User Guide.pdf";
docPath += L"\\VeraCrypt User Guide.pdf";
#elif defined (TC_MACOSX)
docPath += L"/../Resources/TrueCrypt User Guide.pdf";
docPath += L"/../Resources/VeraCrypt User Guide.pdf";
#elif defined (TC_UNIX)
docPath = L"/usr/share/truecrypt/doc/TrueCrypt User Guide.pdf";
docPath = L"/usr/share/veracrypt/doc/VeraCrypt User Guide.pdf";
#else
# error TC_RESOURCE_DIR undefined
#endif

18
src/Main/LanguageStrings.cpp
View File

@ -55,31 +55,31 @@ namespace TrueCrypt
Map["MOUNT_POINT"] = _("Mount Directory");
Map["NO"] = _("No");
Map["NO_VOLUMES_MOUNTED"] = _("No volumes mounted.");
Map["OPEN_NEW_VOLUME"] = _("Specify a New TrueCrypt Volume");
Map["OPEN_NEW_VOLUME"] = _("Specify a New VeraCrypt Volume");
Map["PARAMETER_INCORRECT"] = _("Parameter incorrrect");
Map["SELECT_KEYFILES"] = _("Select Keyfiles");
Map["START_TC"] = _("Start TrueCrypt");
Map["START_TC"] = _("Start VeraCrypt");
Map["VOLUME_ALREADY_MOUNTED"] = _("The volume \"{0}\" is already mounted.");
Map["UNKNOWN_OPTION"] = _("Unknown option");
Map["VOLUME_LOCATION"] = _("Volume Location");
Map["YES"] = _("Yes");
Map["VOLUME_HOST_IN_USE"] = _("WARNING: The host file/device \"{0}\" is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting?");
Map["VIRTUAL_DEVICE"] = _("Virtual Device");
Map["CONFIRM_BACKGROUND_TASK_DISABLED"] = _("WARNING: If the TrueCrypt Background Task is disabled, the following functions, depending on the platform, will be disabled whenever you exit TrueCrypt:\n\n1) Auto-dismount (e.g., upon logoff, time-out, etc.)\n2) Notifications (e.g., when damage to hidden volume is prevented)\n3) Tray icon\n\nNote: You may shut down the Background Task anytime by right-clicking the TrueCrypt tray icon and selecting 'Exit'.\n\nAre you sure you want to disable the TrueCrypt Background Task?");
Map["CONFIRM_EXIT"] = _("WARNING: If TrueCrypt exits now, the following functions, depending on the platform, will be disabled:\n\n1) Auto-dismount (e.g., upon logoff, time-out, etc.)\n2) Notifications (e.g., when damage to hidden volume is prevented)\n3) Tray icon\n\nNote: If you do not wish TrueCrypt to continue running in background after you close its window, disable the Background Task in the Preferences.\n\nAre you sure you want TrueCrypt to exit?");
Map["DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"] = _("WARNING: Data were attempted to be saved to the hidden volume area of the volume \"{0}\"!\n\nTrueCrypt prevented these data from being saved in order to protect the hidden volume. This may have caused filesystem corruption on the outer volume and the operating system may have reported a write error (\"Delayed Write Failed\", \"The parameter is incorrect\", etc.). The entire volume (both the outer and the hidden part) will be write-protected until it is dismounted.\n\nWe strongly recommend that you restart the operating system now.");
Map["CONFIRM_BACKGROUND_TASK_DISABLED"] = _("WARNING: If the VeraCrypt Background Task is disabled, the following functions, depending on the platform, will be disabled whenever you exit VeraCrypt:\n\n1) Auto-dismount (e.g., upon logoff, time-out, etc.)\n2) Notifications (e.g., when damage to hidden volume is prevented)\n3) Tray icon\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nAre you sure you want to disable the VeraCrypt Background Task?");
Map["CONFIRM_EXIT"] = _("WARNING: If VeraCrypt exits now, the following functions, depending on the platform, will be disabled:\n\n1) Auto-dismount (e.g., upon logoff, time-out, etc.)\n2) Notifications (e.g., when damage to hidden volume is prevented)\n3) Tray icon\n\nNote: If you do not wish VeraCrypt to continue running in background after you close its window, disable the Background Task in the Preferences.\n\nAre you sure you want VeraCrypt to exit?");
Map["DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"] = _("WARNING: Data were attempted to be saved to the hidden volume area of the volume \"{0}\"!\n\nVeraCrypt prevented these data from being saved in order to protect the hidden volume. This may have caused filesystem corruption on the outer volume and the operating system may have reported a write error (\"Delayed Write Failed\", \"The parameter is incorrect\", etc.). The entire volume (both the outer and the hidden part) will be write-protected until it is dismounted.\n\nWe strongly recommend that you restart the operating system now.");
Map["ENTER_PASSWORD"] = _("Enter password");
Map["ENTER_PASSWORD_FOR"] = _("Enter password for \"{0}\"");
Map["ENTER_TC_VOL_PASSWORD"] = _("Enter TrueCrypt Volume Password");
Map["ENTER_TC_VOL_PASSWORD"] = _("Enter VeraCrypt Volume Password");
Map["SELECT_KEYFILE_PATH"] = _("Select Keyfile Search Path");
Map["MORE_INFO_ABOUT"] = _("More information on {0}");
Map["TWO_LAYER_CASCADE_HELP"] = _("Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with {0} ({1}-bit key) and then with {2} ({3}-bit key). Each cipher uses its own key. All keys are mutually independent.");
Map["THREE_LAYER_CASCADE_HELP"] = _("Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with {0} ({1}-bit key), then with {2} ({3}-bit key), and finally with {4} ({5}-bit key). Each cipher uses its own key. All keys are mutually independent.");
Map["CHECKING_FS"] = _("Checking the file system on the TrueCrypt volume mounted as {0}...");
Map["REPAIRING_FS"] = _("Attempting to repair the file system on the TrueCrypt volume mounted as {0}...");
Map["CHECKING_FS"] = _("Checking the file system on the VeraCrypt volume mounted as {0}...");
Map["REPAIRING_FS"] = _("Attempting to repair the file system on the VeraCrypt volume mounted as {0}...");
Map["UNMOUNT_LOCK_FAILED"] = _("Volume \"{0}\" contains files or folders being used by applications or system.\n\nForce dismount?");
Map["VOLUME_SIZE_HELP"] = _("Please specify the size of the container to create. Note that the minimum possible size of a volume is 292 KB.");
Map["ENCRYPTION_MODE_NOT_SUPPORTED_BY_KERNEL"] = _("The volume you have mounted uses a mode of operation that is not supported by the Linux kernel. You may experience slow performance when using this volume. To achieve full performance, you should move the data from this volume to a new volume created by TrueCrypt 5.0 or later.");
Map["ENCRYPTION_MODE_NOT_SUPPORTED_BY_KERNEL"] = _("The volume you have mounted uses a mode of operation that is not supported by the Linux kernel. You may experience slow performance when using this volume. To achieve full performance, you should move the data from this volume to a new volume created by VeraCrypt 5.0 or later.");
}
LanguageStrings LangString;

6
src/Main/Resources.cpp
View File

@ -151,8 +151,8 @@ namespace TrueCrypt
#ifdef TC_WINDOWS
return wxIcon (L"IDI_TRUECRYPT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
#else
# include "Resources/Icons/TrueCrypt-16x16.xpm"
return wxIcon (TrueCryptIcon16x16);
# include "Resources/Icons/VeraCrypt-16x16.xpm"
return wxIcon (VeraCryptIcon16x16);
#endif
}
@ -163,7 +163,7 @@ namespace TrueCrypt
#else
static const byte VolumeWizardIcon[] =
{
# include "Format/TrueCrypt_Wizard.bmp.h"
# include "Format/VeraCrypt_Wizard.bmp.h"
};
wxMemoryInputStream stream (VolumeWizardIcon, sizeof (VolumeWizardIcon));

42
src/Main/UserInterface.cpp
View File

@ -48,7 +48,7 @@ namespace TrueCrypt
if (!Preferences.NonInteractive)
{
if (!SystemInfo::IsVersionAtLeast (2, 6, 24))
ShowWarning (_("Your system uses an old version of the Linux kernel.\n\nDue to a bug in the Linux kernel, your system may stop responding when writing data to a TrueCrypt volume. This problem can be solved by upgrading the kernel to version 2.6.24 or later."));
ShowWarning (_("Your system uses an old version of the Linux kernel.\n\nDue to a bug in the Linux kernel, your system may stop responding when writing data to a VeraCrypt volume. This problem can be solved by upgrading the kernel to version 2.6.24 or later."));
}
#endif // TC_LINUX
}
@ -280,7 +280,7 @@ namespace TrueCrypt
prop << LangString["BACKUP_HEADER"] << L": " << LangString[volume.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"] << L'\n';
#ifdef TC_LINUX
if (string (volume.VirtualDevice).find ("/dev/mapper/truecrypt") != 0)
if (string (volume.VirtualDevice).find ("/dev/mapper/veracrypt") != 0)
{
#endif
prop << LangString["TOTAL_DATA_READ"] << L": " << SizeToString (volume.TotalDataRead) << L'\n';
@ -354,10 +354,10 @@ namespace TrueCrypt
// Unresolved exceptions
string typeName (StringConverter::GetTypeName (typeid (ex)));
size_t pos = typeName.find ("TrueCrypt::");
size_t pos = typeName.find ("VeraCrypt::");
if (pos != string::npos)
{
return StringConverter::ToWide (typeName.substr (pos + string ("TrueCrypt::").size()))
return StringConverter::ToWide (typeName.substr (pos + string ("VeraCrypt::").size()))
+ L" at " + StringConverter::ToWide (ex.what());
}
@ -475,7 +475,7 @@ namespace TrueCrypt
EX2MSG (UnsupportedSectorSizeHiddenVolumeProtection, _("Error: The drive uses a sector size other than 512 bytes.\n\nDue to limitations of components available on your platform, outer volumes hosted on the drive cannot be mounted using hidden volume protection.\n\nPossible solutions:\n- Use a drive with 512-byte sectors.\n- Create a file-hosted volume (container) on the drive.\n- Backup the contents of the hidden volume and then update the outer volume."));
EX2MSG (UnsupportedSectorSizeNoKernelCrypto, _("Error: The drive uses a sector size other than 512 bytes.\n\nDue to limitations of components available on your platform, partition/device-hosted volumes on the drive can only be mounted using kernel cryptographic services.\n\nPossible solutions:\n- Enable use of the kernel cryptographic services (Preferences > System Integration).\n- Use a drive with 512-byte sectors.\n- Create a file-hosted volume (container) on the drive."));
#else
EX2MSG (UnsupportedSectorSize, _("Error: The drive uses a sector size other than 512 bytes.\n\nDue to limitations of components available on your platform, partition/device-hosted volumes cannot be created/used on the drive.\n\nPossible solutions:\n- Create a file-hosted volume (container) on the drive.\n- Use a drive with 512-byte sectors.\n- Use TrueCrypt on another platform."));
EX2MSG (UnsupportedSectorSize, _("Error: The drive uses a sector size other than 512 bytes.\n\nDue to limitations of components available on your platform, partition/device-hosted volumes cannot be created/used on the drive.\n\nPossible solutions:\n- Create a file-hosted volume (container) on the drive.\n- Use a drive with 512-byte sectors.\n- Use VeraCrypt on another platform."));
#endif
EX2MSG (VolumeAlreadyMounted, LangString["VOL_ALREADY_MOUNTED"]);
@ -484,7 +484,7 @@ namespace TrueCrypt
EX2MSG (VolumeSlotUnavailable, _("Volume slot unavailable."));
#ifdef TC_MACOSX
EX2MSG (HigherFuseVersionRequired, _("TrueCrypt requires MacFUSE 1.3 or later."));
EX2MSG (HigherFuseVersionRequired, _("VeraCrypt requires MacFUSE 1.3 or later."));
#endif
#undef EX2MSG
@ -1018,8 +1018,8 @@ namespace TrueCrypt
wstring helpText = StringConverter::ToWide (
"Synopsis:\n"
"\n"
"truecrypt [OPTIONS] COMMAND\n"
"truecrypt [OPTIONS] VOLUME_PATH [MOUNT_DIRECTORY]\n"
"veracrypt [OPTIONS] COMMAND\n"
"veracrypt [OPTIONS] VOLUME_PATH [MOUNT_DIRECTORY]\n"
"\n"
"\n"
"Commands:\n"
@ -1103,7 +1103,7 @@ namespace TrueCrypt
"\n"
"MOUNTED_VOLUME:\n"
" Specifies a mounted volume. One of the following forms can be used:\n"
" 1) Path to the encrypted TrueCrypt volume.\n"
" 1) Path to the encrypted VeraCrypt volume.\n"
" 2) Mount directory of the volume's filesystem (if mounted).\n"
" 3) Slot number of the mounted volume (requires --slot).\n"
"\n"
@ -1129,7 +1129,7 @@ namespace TrueCrypt
"\n"
"--fs-options=OPTIONS\n"
" Filesystem mount options. The OPTIONS argument is passed to mount(8)\n"
" command with option -o when a filesystem on a TrueCrypt volume is mounted.\n"
" command with option -o when a filesystem on a VeraCrypt volume is mounted.\n"
" This option is not available on some platforms.\n"
"\n"
"--hash=HASH\n"
@ -1151,7 +1151,7 @@ namespace TrueCrypt
" Load user preferences.\n"
"\n"
"-m, --mount-options=OPTION1[,OPTION2,OPTION3,...]\n"
" Specifies comma-separated mount options for a TrueCrypt volume:\n"
" Specifies comma-separated mount options for a VeraCrypt volume:\n"
" headerbak: Use backup headers when mounting a volume.\n"
" nokernelcrypto: Do not use kernel cryptographic services.\n"
" readonly|ro: Mount volume as read-only.\n"
@ -1227,37 +1227,37 @@ namespace TrueCrypt
"\n"
"IMPORTANT:\n"
"\n"
"If you want to use TrueCrypt, you must follow the security requirements and\n"
"If you want to use VeraCrypt, you must follow the security requirements and\n"
"security precautions listed in chapter 'Security Requirements and Precautions'\n"
"in the TrueCrypt documentation (file 'TrueCrypt User Guide.pdf').\n"
"in the VeraCrypt documentation (file 'VeraCrypt User Guide.pdf').\n"
"\n"
"\nExamples:\n\n"
"Create a new volume:\n"
"truecrypt -t -c\n"
"veracrypt -t -c\n"
"\n"
"Mount a volume:\n"
"truecrypt volume.tc /media/truecrypt1\n"
"veracrypt volume.tc /media/truecrypt1\n"
"\n"
"Mount a volume as read-only, using keyfiles:\n"
"truecrypt -m ro -k keyfile1,keyfile2 volume.tc\n"
"veracrypt -m ro -k keyfile1,keyfile2 volume.tc\n"
"\n"
"Mount a volume without mounting its filesystem:\n"
"truecrypt --filesystem=none volume.tc\n"
"veracrypt --filesystem=none volume.tc\n"
"\n"
"Mount a volume prompting only for its password:\n"
"truecrypt -t -k \"\" --protect-hidden=no volume.tc /media/truecrypt1\n"
"veracrypt -t -k \"\" --protect-hidden=no volume.tc /media/truecrypt1\n"
"\n"
"Dismount a volume:\n"
"truecrypt -d volume.tc\n"
"veracrypt -d volume.tc\n"
"\n"
"Dismount all mounted volumes:\n"
"truecrypt -d\n"
"veracrypt -d\n"
);
#ifndef TC_NO_GUI
if (Application::GetUserInterfaceType() == UserInterfaceType::Graphic)
{
wxDialog dialog (nullptr, wxID_ANY, _("TrueCrypt Command Line Help"), wxDefaultPosition);
wxDialog dialog (nullptr, wxID_ANY, _("VeraCrypt Command Line Help"), wxDefaultPosition);
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
textCtrl->SetFont (wxFont (wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, L"Courier"));

4
src/Main/Xml.cpp
View File

@ -93,7 +93,7 @@ namespace TrueCrypt
TextOutStream.reset (new wxTextOutputStream (*MemOutStream));
OutFile.Open (fileName, File::CreateWrite);
*TextOutStream << L"<?xml version=\"1.0\" encoding=\"utf-8\"?>" << endl << L"<TrueCrypt>" << endl;
*TextOutStream << L"<?xml version=\"1.0\" encoding=\"utf-8\"?>" << endl << L"<VeraCrypt>" << endl;
CurrentIndentLevel = 0;
}
@ -101,7 +101,7 @@ namespace TrueCrypt
{
if (MemOutStream.get())
{
*TextOutStream << L"</TrueCrypt>" << endl;
*TextOutStream << L"</VeraCrypt>" << endl;
wxStreamBuffer *buf = MemOutStream->GetOutputStreamBuffer();
OutFile.Write (ConstBufferPtr (reinterpret_cast <byte *> (buf->GetBufferStart()), buf->GetBufferSize()));

2
src/Makefile
View File

@ -25,7 +25,7 @@
#------ Build configuration ------
export APPNAME := truecrypt
export APPNAME := veracrypt
export BASE_DIR := $(CURDIR)
export BUILD_INC := $(BASE_DIR)/Build/Include

2
src/Platform/PlatformTest.cpp
View File

@ -33,7 +33,7 @@ namespace TrueCrypt
try
{
file->Open ("truecrypt-serializer-test.tmp", File::CreateReadWrite);
file->Open ("veracrypt-serializer-test.tmp", File::CreateReadWrite);
stream = shared_ptr <Stream> (new FileStream (file));
}
catch (...) { }

4
src/Platform/Unix/SystemLog.cpp
View File

@ -13,14 +13,14 @@ namespace TrueCrypt
{
void SystemLog::WriteDebug (const string &debugMessage)
{
openlog ("truecrypt", LOG_PID, LOG_USER);
openlog ("veracrypt", LOG_PID, LOG_USER);
syslog (LOG_DEBUG, "%s", debugMessage.c_str());
closelog();
}
void SystemLog::WriteError (const string &errorMessage)
{
openlog ("truecrypt", LOG_PID, LOG_USER);
openlog ("veracrypt", LOG_PID, LOG_USER);
syslog (LOG_ERR, "%s", errorMessage.c_str());
closelog();
}

BIN
src/Resources/Icons/TrueCrypt-16x16.xpm
View File

Binary file not shown.

BIN
src/Resources/Icons/TrueCrypt-48x48.xpm
View File

Binary file not shown.

BIN
src/Resources/Icons/VeraCrypt-16x16.xpm Normal file
View File

Binary file not shown.

BIN
src/Resources/Icons/VeraCrypt-48x48.xpm Normal file
View File

Binary file not shown.