diff options
| author | Tomasz Swierczek <t.swierczek@samsung.com> | 2022-01-17 12:06:21 +0100 |
|---|---|---|
| committer | Tomasz Swierczek <t.swierczek@samsung.com> | 2022-01-17 17:10:54 +0100 |
| commit | 62911bc684c6f4ab7cc73158cdfa30210099a1f9 (patch) | |
| tree | 4f7731841f84e8b43812d8c448e25964ab814ac4 | |
| parent | fd887bad6a200db50fd3e10df4c87396f0e560f8 (diff) | |
| download | yaca-accepted/tizen_7.0_unified_hotfix.tar.gz yaca-accepted/tizen_7.0_unified_hotfix.tar.bz2 yaca-accepted/tizen_7.0_unified_hotfix.zip | |
Fix build break with -Wshadow compiler flagtizen_7.0_m2_releasesubmit/tizen/20220117.233650accepted/tizen/unified/20220118.123209accepted/tizen/8.0/unified/20231005.093716accepted/tizen/7.0/unified/hotfix/20221116.105643accepted/tizen/7.0/unified/20221110.063345tizen_7.0_hotfixtizen_7.0accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unified
In some env. a certain set of compiler flags is used and
few "int ret" variables seem to cause an issue,
overshadowing previous declarations.
Change-Id: I724fdc1a3bb381a33700145872d180c7ba4c8d18
| -rw-r--r-- | tests/mock_test_key.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/mock_test_key.cpp b/tests/mock_test_key.cpp index 2c94c4d..73432ac 100644 --- a/tests/mock_test_key.cpp +++ b/tests/mock_test_key.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2020-2022 Samsung Electronics Co., Ltd All Rights Reserved * * Contact: Lukasz Pawelczyk <l.pawelczyk@samsung.com> * @@ -422,14 +422,14 @@ BOOST_FIXTURE_TEST_CASE(T1207__mock__negative__key_derive_kdf, InitFixture) for (const auto &ka: kargs) { auto test_code = [&ka, &secret]() { - int ret; + int ret_derive; char *key_material = NULL;; - ret = yaca_key_derive_kdf(ka.kdf, ka.digest, secret, SECRET_LEN, - NULL, 0, MATERIAL_LEN, &key_material); + ret_derive = yaca_key_derive_kdf(ka.kdf, ka.digest, secret, SECRET_LEN, + NULL, 0, MATERIAL_LEN, &key_material); yaca_free(key_material); - return ret; + return ret_derive; }; call_mock_test(test_code); @@ -461,14 +461,14 @@ BOOST_FIXTURE_TEST_CASE(T1208__mock__negative__key_derive_pbkdf2, InitFixture) for (const auto &pa: pargs) { auto test_code = [&pa, &salt]() { - int ret; + int ret_derive; yaca_key_h key = YACA_KEY_NULL; - ret = yaca_key_derive_pbkdf2(PASSWORD, salt, SALT_LEN, pa.iter, - pa.digest, pa.bit_len, &key); + ret_derive = yaca_key_derive_pbkdf2(PASSWORD, salt, SALT_LEN, pa.iter, + pa.digest, pa.bit_len, &key); yaca_key_destroy(key); - return ret; + return ret_derive; }; call_mock_test(test_code); |