Bug 1223073 - Move ssl_prf_unittest.cc to pk11_gtest. r=ekr
authorTim Taubert <ttaubert@mozilla.com>
Tue, 17 Nov 2015 10:43:47 -0800
changeset 11725 5eb91d4b59f510037a2c17793235b46b245e4e1c
parent 11724 ea2b31526dac817f30a249cf34b123b2a904b8f9
child 11726 c796df3ba714a93d292d7d38a5eaf521314e6aaa
push id861
push userekr@mozilla.com
push dateTue, 17 Nov 2015 18:43:59 +0000
reviewersekr
bugs1223073
Bug 1223073 - Move ssl_prf_unittest.cc to pk11_gtest. r=ekr
external_tests/pk11_gtest/manifest.mn
external_tests/pk11_gtest/pk11_prf_unittest.cc
external_tests/ssl_gtest/manifest.mn
external_tests/ssl_gtest/ssl_prf_unittest.cc
--- a/external_tests/pk11_gtest/manifest.mn
+++ b/external_tests/pk11_gtest/manifest.mn
@@ -3,16 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
       pk11_pbkdf2_unittest.cc \
+      pk11_prf_unittest.cc \
       pk11_rsapss_unittest.cc \
       pk11_gtest.cc \
       $(NULL)
 
 INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
             -I$(CORE_DEPTH)/external_tests/common
 
 REQUIRES = nspr nss libdbm gtest
rename from external_tests/ssl_gtest/ssl_prf_unittest.cc
rename to external_tests/pk11_gtest/pk11_prf_unittest.cc
--- a/external_tests/ssl_gtest/ssl_prf_unittest.cc
+++ b/external_tests/pk11_gtest/pk11_prf_unittest.cc
@@ -3,23 +3,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nss.h"
 #include "pk11pub.h"
 #include <memory>
 
-#include "gtest_utils.h"
+#include "gtest/gtest.h"
 
 namespace nss_test {
 
-#define CONST_UINT8_TO_UCHAR(a) const_cast<unsigned char*>( \
-    static_cast<const unsigned char *>(a))
-
 const size_t kPmsSize = 48;
 const size_t kMasterSecretSize = 48;
 const size_t kPrfSeedSizeSha256 = 32;
 const size_t kPrfSeedSizeTlsPrf = 36;
 
 // This is not the right size for anything
 const size_t kIncorrectSize = 17;
 
--- a/external_tests/ssl_gtest/manifest.mn
+++ b/external_tests/ssl_gtest/manifest.mn
@@ -10,17 +10,16 @@ MODULE = nss
 CSRCS = \
       libssl_internals.c \
       $(NULL)
 
 CPPSRCS = \
       ssl_agent_unittest.cc \
       ssl_loopback_unittest.cc \
       ssl_extension_unittest.cc \
-      ssl_prf_unittest.cc \
       ssl_skip_unittest.cc \
       ssl_gtest.cc \
       test_io.cc \
       tls_agent.cc \
       tls_connect.cc \
       tls_filter.cc \
       tls_parser.cc \
       $(NULL)