Revert of Roll src/third_party/boringssl/src 68de407:de12d6c

third_party/boringssl/boringssl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdarg.h>
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 139 matching lines @@
 }
 
 TEST(BoringSSL, BN) {
   TestSimple("bn_test");
 }
 
 TEST(BoringSSL, ByteString) {
   TestSimple("bytestring_test");
 }
 
+TEST(BoringSSL, ConstantTime) {
+  TestSimple("constant_time_test");
+}
+
 TEST(BoringSSL, Cipher) {
   base::FilePath data_file;
   ASSERT_TRUE(CryptoCipherTestPath(&data_file));
   data_file = data_file.Append(FILE_PATH_LITERAL("cipher_test.txt"));
 
   std::vector<base::CommandLine::StringType> args;
   args.push_back(data_file.value());
 
   TestProcess("cipher_test", args);
 }
 
-TEST(BoringSSL, CMAC) {
-  TestSimple("cmac_test");
-}
-
-TEST(BoringSSL, ConstantTime) {
-  TestSimple("constant_time_test");
-}
-
 TEST(BoringSSL, DH) {
   TestSimple("dh_test");
 }
 
 TEST(BoringSSL, Digest) {
   TestSimple("digest_test");
 }
 
 TEST(BoringSSL, DSA) {
   TestSimple("dsa_test");
 }
 
 TEST(BoringSSL, EC) {
   TestSimple("ec_test");
 }
 
 TEST(BoringSSL, ECDSA) {
   TestSimple("ecdsa_test");
 }
 
 TEST(BoringSSL, ERR) {
   TestSimple("err_test");
 }
 
 TEST(BoringSSL, GCM) {
   TestSimple("gcm_test");
 }
 
 TEST(BoringSSL, HMAC) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("hmac_test", args);
+  TestSimple("hmac_test");
 }
 
 TEST(BoringSSL, LH) {
   TestSimple("lhash_test");
 }
 
 TEST(BoringSSL, RSA) {
   TestSimple("rsa_test");
 }
 
 TEST(BoringSSL, PKCS7) {
   TestSimple("pkcs7_test");
 }
 
 TEST(BoringSSL, PKCS12) {
   TestSimple("pkcs12_test");
 }
 
 TEST(BoringSSL, ExampleMul) {
   TestSimple("example_mul");
 }
 
 TEST(BoringSSL, EVP) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("evp_test", args);
-}
-
-// evp_test is also run on hmac_test's input.
-TEST(BoringSSL, EVPHMAC) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("evp_test", args);
-}
-
-TEST(BoringSSL, EVPExtra) {
-  TestSimple("evp_extra_test");
+  TestSimple("evp_test");
 }
 
 TEST(BoringSSL, SSL) {
   TestSimple("ssl_test");
 }
 
 TEST(BoringSSL, PQueue) {
   TestSimple("pqueue_test");
 }
 
 TEST(BoringSSL, HKDF) {
   TestSimple("hkdf_test");
 }
 
 TEST(BoringSSL, PBKDF) {
   TestSimple("pbkdf_test");
 }
 
 TEST(BoringSSL, Thread) {
   TestSimple("thread_test");
 }