1 files changed, 19 insertions, 21 deletions

diff --git a/toxcore/crypto_core_test.cc b/toxcore/crypto_core_test.cc
index ee3cb366..66569506 100644
--- a/toxcore/crypto_core_test.cc
+++ b/toxcore/crypto_core_test.cc
@@ -1,6 +1,7 @@
 #include "crypto_core.h"
 
 #include <algorithm>
+#include <vector>
 
 #include <gtest/gtest.h>
 
@@ -29,7 +30,7 @@ enum {
   CRYPTO_TEST_MEMCMP_EPS = 10,
 };
 
-clock_t memcmp_time(void *a, void *b, size_t len) {
+clock_t memcmp_time(uint8_t const *a, uint8_t const *b, size_t len) {
   clock_t start = clock();
   volatile int result = crypto_memcmp(a, b, len);
   (void)result;
@@ -41,8 +42,8 @@ clock_t memcmp_time(void *a, void *b, size_t len) {
  * equal and non-equal arrays to reduce the influence of external effects
  * such as the machine being a little more busy 1 second later.
  */
-void memcmp_median(void *src, void *same, void *not_same, size_t len, clock_t *same_median,
-                   clock_t *not_same_median) {
+std::pair<clock_t, clock_t> memcmp_median(uint8_t const *src, uint8_t const *same,
+                                          uint8_t const *not_same, size_t len) {
   clock_t same_results[CRYPTO_TEST_MEMCMP_ITERATIONS];
   clock_t not_same_results[CRYPTO_TEST_MEMCMP_ITERATIONS];
 
@@ -52,9 +53,10 @@ void memcmp_median(void *src, void *same, void *not_same, size_t len, clock_t *s
   }
 
   std::sort(same_results, same_results + CRYPTO_TEST_MEMCMP_ITERATIONS);
-  *same_median = same_results[CRYPTO_TEST_MEMCMP_ITERATIONS / 2];
+  clock_t const same_median = same_results[CRYPTO_TEST_MEMCMP_ITERATIONS / 2];
   std::sort(not_same_results, not_same_results + CRYPTO_TEST_MEMCMP_ITERATIONS);
-  *not_same_median = not_same_results[CRYPTO_TEST_MEMCMP_ITERATIONS / 2];
+  clock_t const not_same_median = not_same_results[CRYPTO_TEST_MEMCMP_ITERATIONS / 2];
+  return {same_median, not_same_median};
 }
 
 /**
@@ -63,32 +65,28 @@ void memcmp_median(void *src, void *same, void *not_same, size_t len, clock_t *s
  */
 TEST(CryptoCore, MemcmpTimingIsDataIndependent) {
   // A random piece of memory.
-  auto *src = new uint8_t[CRYPTO_TEST_MEMCMP_SIZE];
-  random_bytes(src, CRYPTO_TEST_MEMCMP_SIZE);
+  std::vector<uint8_t> src(CRYPTO_TEST_MEMCMP_SIZE);
+  random_bytes(src.data(), CRYPTO_TEST_MEMCMP_SIZE);
 
   // A separate piece of memory containing the same data.
-  auto *same = new uint8_t[CRYPTO_TEST_MEMCMP_SIZE];
-  memcpy(same, src, CRYPTO_TEST_MEMCMP_SIZE);
+  std::vector<uint8_t> same = src;
 
   // Another piece of memory containing different data.
-  auto *not_same = new uint8_t[CRYPTO_TEST_MEMCMP_SIZE];
-  random_bytes(not_same, CRYPTO_TEST_MEMCMP_SIZE);
+  std::vector<uint8_t> not_same(CRYPTO_TEST_MEMCMP_SIZE);
+  random_bytes(not_same.data(), CRYPTO_TEST_MEMCMP_SIZE);
 
-  clock_t same_median;
-  clock_t not_same_median;
-  memcmp_median(src, same, not_same, CRYPTO_TEST_MEMCMP_SIZE, &same_median, &not_same_median);
-
-  delete[] not_same;
-  delete[] same;
-  delete[] src;
+  // Once we have C++17:
+  // auto const [same_median, not_same_median] =
+  auto const result =
+      memcmp_median(src.data(), same.data(), not_same.data(), CRYPTO_TEST_MEMCMP_SIZE);
 
   clock_t const delta =
-      same_median > not_same_median ? same_median - not_same_median : not_same_median - same_median;
+      std::max(result.first, result.second) - std::min(result.first, result.second);
 
   EXPECT_LT(delta, CRYPTO_TEST_MEMCMP_EPS)
       << "Delta time is too long (" << delta << " >= " << CRYPTO_TEST_MEMCMP_EPS << ")\n"
-      << "Time of the same data comparison: " << same_median << " clocks\n"
-      << "Time of the different data comparison: " << not_same_median << " clocks";
+      << "Time of the same data comparison: " << result.first << " clocks\n"
+      << "Time of the different data comparison: " << result.second << " clocks";
 }
 
 }  // namespace