diff options
| author | ambrosin <ambrosin@google.com> | 2023-04-20 06:13:22 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-04-20 06:14:39 -0700 |
| commit | 113db291f03cc90700f8278ff24f9cfb1f0db05b (patch) | |
| tree | 4a0f7a1a706682a1da46a132f06863bd7ad9c1bf /cc/prf | |
| parent | 4239f1069b4bff49e175235ff1e12f13d145e4e5 (diff) | |
| download | tink-113db291f03cc90700f8278ff24f9cfb1f0db05b.tar.gz | |
Replace direct use of FIPS_mode with an internal util function
The function returns `false` if OpenSSL is used.
PiperOrigin-RevId: 525726396
Diffstat (limited to 'cc/prf')
| -rw-r--r-- | cc/prf/BUILD.bazel | 2 | ||||
| -rw-r--r-- | cc/prf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cc/prf/prf_config_test.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cc/prf/BUILD.bazel b/cc/prf/BUILD.bazel index 2d2ab6bbc..40eb6ab37 100644 --- a/cc/prf/BUILD.bazel +++ b/cc/prf/BUILD.bazel @@ -274,7 +274,7 @@ cc_test( ":prf_key_templates", ":prf_set", "//:tink_cc", - "//config:tink_fips", + "//internal:fips_utils", "//util:status", "//util:test_matchers", "//util:test_util", diff --git a/cc/prf/CMakeLists.txt b/cc/prf/CMakeLists.txt index bc0d888c6..ebe61bc85 100644 --- a/cc/prf/CMakeLists.txt +++ b/cc/prf/CMakeLists.txt @@ -263,7 +263,7 @@ tink_cc_test( absl::status crypto tink::core::cc - tink::config::tink_fips + tink::internal::fips_utils tink::util::status tink::util::test_matchers tink::util::test_util diff --git a/cc/prf/prf_config_test.cc b/cc/prf/prf_config_test.cc index f50c31052..f86df0bc4 100644 --- a/cc/prf/prf_config_test.cc +++ b/cc/prf/prf_config_test.cc @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/status/status.h" -#include "tink/config/tink_fips.h" +#include "tink/internal/fips_utils.h" #include "tink/keyset_handle.h" #include "tink/prf/hmac_prf_key_manager.h" #include "tink/prf/prf_key_templates.h" @@ -43,7 +43,7 @@ class PrfConfigTest : public ::testing::Test { }; TEST_F(PrfConfigTest, RegisterWorks) { - if (IsFipsModeEnabled()) { + if (internal::IsFipsModeEnabled()) { GTEST_SKIP() << "Not supported in FIPS-only mode"; } @@ -58,7 +58,7 @@ TEST_F(PrfConfigTest, RegisterWorks) { // FIPS-only mode tests TEST_F(PrfConfigTest, RegisterNonFipsTemplates) { - if (!IsFipsModeEnabled() || !FIPS_mode()) { + if (!internal::IsFipsModeEnabled() || !internal::IsFipsEnabledInSsl()) { GTEST_SKIP() << "Only supported in FIPS-only mode"; } @@ -76,7 +76,7 @@ TEST_F(PrfConfigTest, RegisterNonFipsTemplates) { } TEST_F(PrfConfigTest, RegisterFipsValidTemplates) { - if (!IsFipsModeEnabled() || !FIPS_mode()) { + if (!internal::IsFipsModeEnabled() || !internal::IsFipsEnabledInSsl()) { GTEST_SKIP() << "Only supported in FIPS-only mode"; } |