diff options
Diffstat (limited to 'src/Main/Forms/BenchmarkDialog.cpp')
-rw-r--r-- | src/Main/Forms/BenchmarkDialog.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/Main/Forms/BenchmarkDialog.cpp b/src/Main/Forms/BenchmarkDialog.cpp index 7b0209ff..6e2cff64 100644 --- a/src/Main/Forms/BenchmarkDialog.cpp +++ b/src/Main/Forms/BenchmarkDialog.cpp @@ -1,78 +1,81 @@ /* Derived from source code of TrueCrypt 7.1a, which is Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2017 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. */ #include "System.h" #include "Volume/EncryptionModeXTS.h" +#ifdef WOLFCRYPT_BACKEND +#include "Volume/EncryptionModeWolfCryptXTS.h" +#endif #include "Main/GraphicUserInterface.h" #include "BenchmarkDialog.h" namespace VeraCrypt { BenchmarkDialog::BenchmarkDialog (wxWindow *parent) : BenchmarkDialogBase (parent) { BenchmarkNoteStaticText->SetLabel (LangString["IDT_BOX_BENCHMARK_INFO"]); BenchmarkNoteStaticText->Wrap (RightSizer->GetSize().GetWidth()); list <size_t> bufferSizes; bufferSizes.push_back (1 * BYTES_PER_MB); bufferSizes.push_back (5 * BYTES_PER_MB); bufferSizes.push_back (10 * BYTES_PER_MB); bufferSizes.push_back (50 * BYTES_PER_MB); bufferSizes.push_back (100 * BYTES_PER_MB); bufferSizes.push_back (200 * BYTES_PER_MB); bufferSizes.push_back (500 * BYTES_PER_MB); bufferSizes.push_back (1 * BYTES_PER_GB); foreach (size_t size, bufferSizes) { BufferSizeChoice->Append (Gui->SizeToString (size), (void *) size); } BenchmarkChoice->Select (0); BufferSizeChoice->Select (1); UpdateBenchmarkList (); - - wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); // wxFILTER_NUMERIC does not exclude - . , etc. - const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" }; - validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr)); + + VolumePimText->SetMinSize (wxSize (Gui->GetCharWidth (VolumePimText) * 15, -1)); + + wxTextValidator validator (wxFILTER_DIGITS); VolumePimText->SetValidator (validator); Layout(); Fit(); Center(); } void BenchmarkDialog::UpdateBenchmarkList () { int index = BenchmarkChoice->GetSelection (); if (index == 1) { // PRF case m_volumePimLabel->Show (); VolumePimText->Show (); BufferSizeChoice->Hide (); m_bufferSizeLabel->Hide (); } else { m_volumePimLabel->Hide (); VolumePimText->Hide (); BufferSizeChoice->Show (); m_bufferSizeLabel->Show (); } BenchmarkListCtrl->DeleteAllItems(); BenchmarkListCtrl->DeleteAllColumns(); @@ -182,63 +185,67 @@ namespace VeraCrypt fields[ColumnHashMean] = Gui->SpeedToString (result.MeanSpeed); } Gui->AppendToListCtrl (BenchmarkListCtrl, fields); } BenchmarkListCtrl->SetColumnWidth(0, wxLIST_AUTOSIZE); wxSize minSize = BenchmarkListCtrl->GetBestSize (); minSize.IncBy (10, 20); BenchmarkListCtrl->SetMinSize(minSize); Layout (); Fit(); } void BenchmarkDialog::DoBenchmark (list<BenchmarkResult>& results, Buffer& buffer, int opIndex) { try { if (opIndex == 0) { EncryptionAlgorithmList encryptionAlgorithms = EncryptionAlgorithm::GetAvailableAlgorithms(); foreach (shared_ptr <EncryptionAlgorithm> ea, encryptionAlgorithms) { if (!ea->IsDeprecated()) { BenchmarkResult result; result.AlgorithmName = ea->GetName(true); Buffer key (ea->GetKeySize()); ea->SetKey (key); - + #ifdef WOLFCRYPT_BACKEND + shared_ptr <EncryptionMode> xts (new EncryptionModeWolfCryptXTS); + ea->SetKeyXTS (key); + #else shared_ptr <EncryptionMode> xts (new EncryptionModeXTS); - xts->SetKey (key); + #endif + xts->SetKey (key); ea->SetMode (xts); wxLongLong startTime = wxGetLocalTimeMillis(); // CPU "warm up" (an attempt to prevent skewed results on systems where CPU frequency gradually changes depending on CPU load). do { ea->EncryptSectors (buffer, 0, buffer.Size() / ENCRYPTION_DATA_UNIT_SIZE, ENCRYPTION_DATA_UNIT_SIZE); } while (wxGetLocalTimeMillis().GetValue() - startTime.GetValue() < 20); uint64 size = 0; uint64 time; startTime = wxGetLocalTimeMillis(); do { ea->EncryptSectors (buffer, 0, buffer.Size() / ENCRYPTION_DATA_UNIT_SIZE, ENCRYPTION_DATA_UNIT_SIZE); size += buffer.Size(); time = (uint64) (wxGetLocalTimeMillis().GetValue() - startTime.GetValue()); } while (time < 100); result.EncryptionSpeed = size * 1000 / time; startTime = wxGetLocalTimeMillis(); size = 0; do { @@ -247,61 +254,61 @@ namespace VeraCrypt time = (uint64) (wxGetLocalTimeMillis().GetValue() - startTime.GetValue()); } while (time < 100); result.DecryptionSpeed = size * 1000 / time; result.MeanSpeed = (result.EncryptionSpeed + result.DecryptionSpeed) / 2; bool inserted = false; for (list <BenchmarkResult>::iterator i = results.begin(); i != results.end(); ++i) { if (i->MeanSpeed < result.MeanSpeed) { results.insert (i, result); inserted = true; break; } } if (!inserted) results.push_back (result); } } } else if (opIndex == 1) { Buffer dk(MASTER_KEYDATA_SIZE); Buffer salt(64); const char *tmp_salt = {"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x01\x23\x45\x67\x89\xAB\xCD\xEF\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF\x01\x23\x45\x67\x89\xAB\xCD\xEF\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA\xBB\xCC\xDD\xEE\xFF"}; unsigned long pim; Pkcs5KdfList prfList = Pkcs5Kdf::GetAvailableAlgorithms (); - VolumePassword password ((const byte*) "passphrase-1234567890", 21); + VolumePassword password ((const uint8*) "passphrase-1234567890", 21); memcpy (&pim, buffer.Ptr (), sizeof (unsigned long)); memcpy (salt.Ptr(), tmp_salt, 64); foreach (shared_ptr <Pkcs5Kdf> prf, prfList) { if (!prf->IsDeprecated()) { BenchmarkResult result; result.AlgorithmName = prf->GetName (); result.Iterations = (uint64) prf->GetIterationCount (pim); uint64 time; wxLongLong startTime = wxGetLocalTimeMillis(); for (int i = 1; i <= 2; i++) { prf->DeriveKey (dk, password, pim, salt); } time = (uint64) (wxGetLocalTimeMillis().GetValue() - startTime.GetValue()); result.Time = time / 2; bool inserted = false; for (list <BenchmarkResult>::iterator i = results.begin(); i != results.end(); ++i) { if (i->Time > result.Time) { results.insert (i, result); |