From 55be783c85f4e0917b277b8480108585f9ba9f50 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 8 Jun 2020 10:41:09 -0500 Subject: [PATCH] settings: Remove deprecated SETTINGS_USE_BASE64 support Remove code and associated tests and Kconfig related to SETTINGS_USE_BASE64 that was deprecated in Zephyr 2.2 Signed-off-by: Kumar Gala --- doc/releases/release-notes-2.5.rst | 3 + subsys/settings/Kconfig | 9 - subsys/settings/src/settings_line.c | 169 ++---------------- .../subsys/settings/fcb/base64/CMakeLists.txt | 17 -- .../settings/fcb/base64/native_posix.overlay | 25 --- .../fcb/base64/native_posix_64.overlay | 25 --- .../fcb/base64/nrf52840dk_nrf52840.overlay | 25 --- .../fcb/base64/nrf52dk_nrf52832.overlay | 25 --- .../subsys/settings/fcb/base64/placeholder.c | 2 - tests/subsys/settings/fcb/base64/prj.conf | 12 -- .../settings/fcb/base64/prj_native_posix.conf | 11 -- .../fcb/base64/prj_native_posix_64.conf | 11 -- .../subsys/settings/fcb/base64/testcase.yaml | 4 - tests/subsys/settings/fcb/raw/prj.conf | 1 - .../settings/fcb/raw/prj_native_posix.conf | 1 - .../settings/fcb/raw/prj_native_posix_64.conf | 1 - .../settings/fcb/src/settings_test_fcb.c | 7 - .../fs/src/settings_test_compress_file.c | 10 -- .../fs/src/settings_test_multiple_in_file.c | 7 - .../fs/src/settings_test_save_in_file.c | 5 - .../fs/src/settings_test_small_file.c | 5 - tests/subsys/settings/functional/fcb/prj.conf | 1 - .../functional/fcb/prj_native_posix.conf | 1 - .../functional/fcb/prj_native_posix_64.conf | 1 - .../settings/functional/fcb/prj_qemu_x86.conf | 1 - .../subsys/settings/functional/file/prj.conf | 1 - .../functional/file/prj_native_posix.conf | 1 - .../functional/file/prj_native_posix_64.conf | 1 - .../functional/file/prj_qemu_x86.conf | 1 - tests/subsys/settings/functional/nvs/prj.conf | 1 - .../subsys/settings/littlefs/base64/prj.conf | 1 - .../littlefs/base64/prj_native_posix.conf | 1 - .../littlefs/base64/prj_native_posix_64.conf | 1 - tests/subsys/settings/littlefs/raw/prj.conf | 1 - .../littlefs/raw/prj_native_posix.conf | 1 - .../littlefs/raw/prj_native_posix_64.conf | 1 - tests/subsys/settings/nvs/raw/prj.conf | 1 - 37 files changed, 15 insertions(+), 376 deletions(-) delete mode 100644 tests/subsys/settings/fcb/base64/CMakeLists.txt delete mode 100644 tests/subsys/settings/fcb/base64/native_posix.overlay delete mode 100644 tests/subsys/settings/fcb/base64/native_posix_64.overlay delete mode 100644 tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay delete mode 100644 tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay delete mode 100644 tests/subsys/settings/fcb/base64/placeholder.c delete mode 100644 tests/subsys/settings/fcb/base64/prj.conf delete mode 100644 tests/subsys/settings/fcb/base64/prj_native_posix.conf delete mode 100644 tests/subsys/settings/fcb/base64/prj_native_posix_64.conf delete mode 100644 tests/subsys/settings/fcb/base64/testcase.yaml diff --git a/doc/releases/release-notes-2.5.rst b/doc/releases/release-notes-2.5.rst index ca2b5c6c80b..f1ed9c35a26 100644 --- a/doc/releases/release-notes-2.5.rst +++ b/doc/releases/release-notes-2.5.rst @@ -29,6 +29,9 @@ interface and listing all issues with the `bug label API Changes *********** +* Removed SETTINGS_USE_BASE64 support as its been deprecated for more than + two releases. + Deprecated in this release ========================== diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig index f30e9eb658c..d204f14cba5 100644 --- a/subsys/settings/Kconfig +++ b/subsys/settings/Kconfig @@ -33,15 +33,6 @@ config SETTINGS_ENCODE_LEN depends on SETTINGS bool -config SETTINGS_USE_BASE64 - bool "encoding value using base64 (deprecated)" - depends on SETTINGS - select BASE64 - help - This option has been deprecated and will not be supported - in future releases. - Enables values encoding using Base64. - choice prompt "Storage back-end" default SETTINGS_NVS if NVS diff --git a/subsys/settings/src/settings_line.c b/subsys/settings/src/settings_line.c index d4628b728d5..420c230bc2c 100644 --- a/subsys/settings/src/settings_line.c +++ b/subsys/settings/src/settings_line.c @@ -11,10 +11,6 @@ #include "settings/settings.h" #include "settings_priv.h" -#ifdef CONFIG_SETTINGS_USE_BASE64 -#include -#endif - #include LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL); @@ -32,14 +28,6 @@ int settings_line_write(const char *name, const char *value, size_t val_len, { size_t w_size, rem, add; -#ifdef CONFIG_SETTINGS_USE_BASE64 - /* minimal buffer for encoding base64 + EOL*/ - char enc_buf[MAX_ENC_BLOCK_SIZE + 1]; - - char *p_enc = enc_buf; - size_t enc_len = 0; -#endif - bool done; char w_buf[16]; /* write buff, must be aligned either to minimal */ /* base64 encoding size and write-block-size */ @@ -99,46 +87,23 @@ int settings_line_write(const char *name, const char *value, size_t val_len, while (1) { while (w_size < sizeof(w_buf)) { -#ifdef CONFIG_SETTINGS_USE_BASE64 - if (enc_len) { - add = MIN(enc_len, sizeof(w_buf) - w_size); - memcpy(&w_buf[w_size], p_enc, add); - enc_len -= add; + if (rem) { + add = MIN(rem, sizeof(w_buf) - w_size); + memcpy(&w_buf[w_size], value, add); + value += add; + rem -= add; w_size += add; - p_enc += add; } else { -#endif - if (rem) { -#ifdef CONFIG_SETTINGS_USE_BASE64 - add = MIN(rem, MAX_ENC_BLOCK_SIZE/4*3); - rc = base64_encode(enc_buf, sizeof(enc_buf), &enc_len, value, add); - if (rc) { - return -EINVAL; - } - value += add; - rem -= add; - p_enc = enc_buf; -#else - add = MIN(rem, sizeof(w_buf) - w_size); - memcpy(&w_buf[w_size], value, add); - value += add; - rem -= add; + add = (w_size) % wbs; + if (add) { + add = wbs - add; + memset(&w_buf[w_size], '\0', + add); w_size += add; -#endif - } else { - add = (w_size) % wbs; - if (add) { - add = wbs - add; - memset(&w_buf[w_size], '\0', - add); - w_size += add; - } - done = true; - break; } -#ifdef CONFIG_SETTINGS_USE_BASE64 + done = true; + break; } -#endif } rc = settings_io_cb.write_cb(cb_arg, w_loc, w_buf, w_size); @@ -188,13 +153,8 @@ int settings_line_len_calc(const char *name, size_t val_len) { int len; -#ifdef CONFIG_SETTINGS_USE_BASE64 - /* */ - len = val_len/3*4 + ((val_len%3) ? 4 : 0); -#else /* */ len = val_len; -#endif /* = */ len += strlen(name) + 1; @@ -286,78 +246,6 @@ int settings_line_raw_read(off_t seek, char *out, size_t len_req, NULL, cb_arg); } -#ifdef CONFIG_SETTINGS_USE_BASE64 -/* off from value begin */ -int settings_line_val_read(off_t val_off, off_t off, char *out, size_t len_req, - size_t *len_read, void *cb_arg) -{ - char enc_buf[16 + 1]; - char dec_buf[sizeof(enc_buf)/4 * 3 + 1]; - size_t rem_size, read_size, exp_size, clen, olen; - off_t seek_begin, off_begin; - int rc; - - - rem_size = len_req; - - while (rem_size) { - seek_begin = off / 3 * 4; - off_begin = seek_begin / 4 * 3; - - read_size = rem_size / 3 * 4; - read_size += (rem_size % 3 != 0 || off_begin != off) ? 4 : 0; - - read_size = MIN(read_size, sizeof(enc_buf) - 1); - exp_size = read_size; - - rc = settings_line_raw_read(val_off + seek_begin, enc_buf, - read_size, &read_size, cb_arg); - if (rc) { - return rc; - } - - enc_buf[read_size] = 0; /* breaking guaranteed */ - read_size = strlen(enc_buf); - - if (read_size == 0) { - /* a NULL value (deleted entry) */ - *len_read = 0; - return 0; - } - - if (read_size % 4) { - /* unexpected use case - an encoding problem */ - return -EINVAL; - } - - rc = base64_decode(dec_buf, sizeof(dec_buf), &olen, enc_buf, - read_size); - - if (rc) { - return rc; - } - - dec_buf[olen] = 0; - - clen = MIN(olen + off_begin - off, rem_size); - - memcpy(out, &dec_buf[off - off_begin], clen); - rem_size -= clen; - - if (exp_size > read_size || olen < read_size/4*3) { - break; - } - - out += clen; - off += clen; - } - - *len_read = len_req - rem_size; - - return 0; -} -#else - /* off from value begin */ int settings_line_val_read(off_t val_off, off_t off, char *out, size_t len_req, size_t *len_read, void *cb_arg) @@ -365,47 +253,14 @@ int settings_line_val_read(off_t val_off, off_t off, char *out, size_t len_req, return settings_line_raw_read(val_off + off, out, len_req, len_read, cb_arg); } -#endif size_t settings_line_val_get_len(off_t val_off, void *read_cb_ctx) { size_t len; len = settings_io_cb.get_len_cb(read_cb_ctx); -#ifdef CONFIG_SETTINGS_USE_BASE64 - uint8_t raw[2]; - int rc; - size_t len_base64 = len - val_off; - /* don't care about lack of alignmet to 4 B */ - /* entire value redout call will return error anyway */ - if (len_base64 >= 4) { - /* read last 2 B of base64 */ - rc = settings_line_raw_read(len - 2, raw, 2, &len, read_cb_ctx); - if (rc || len != 2) { - /* very unexpected error */ - if (rc != 0) { - LOG_ERR("Failed to read the storage (%d)", rc); - } - return 0; - } - - len = (len_base64 / 4) * 3; - - /* '=' is the padding of Base64 */ - if (raw[0] == '=') { - len -= 2; - } else if (raw[1] == '=') { - len--; - } - - return len; - } else { - return 0; - } -#else return len - val_off; -#endif } /** diff --git a/tests/subsys/settings/fcb/base64/CMakeLists.txt b/tests/subsys/settings/fcb/base64/CMakeLists.txt deleted file mode 100644 index 020e00dd403..00000000000 --- a/tests/subsys/settings/fcb/base64/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.13.1) -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(settings_fcb) - -add_subdirectory(../src fcb_test_bindir) -target_link_libraries(app PRIVATE settings_fcb_test) - -# The code is in the library common to several tests. -target_sources(app PRIVATE placeholder.c) - -if(TEST) - target_compile_definitions(app PRIVATE - -DTEST_${TEST} - ) -endif() diff --git a/tests/subsys/settings/fcb/base64/native_posix.overlay b/tests/subsys/settings/fcb/base64/native_posix.overlay deleted file mode 100644 index a92b351a84f..00000000000 --- a/tests/subsys/settings/fcb/base64/native_posix.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2019 Jan Van Winkel - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/delete-node/ &storage_partition; -/delete-node/ &scratch_partition; - -&flash0 { - /* - * For more information, see: - * https://docs.zephyrproject.org/latest/guides/dts/legacy-macros.html#legacy-flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@70000 { - label = "storage"; - reg = <0x00070000 0x10000>; - }; - }; -}; diff --git a/tests/subsys/settings/fcb/base64/native_posix_64.overlay b/tests/subsys/settings/fcb/base64/native_posix_64.overlay deleted file mode 100644 index a92b351a84f..00000000000 --- a/tests/subsys/settings/fcb/base64/native_posix_64.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2019 Jan Van Winkel - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/delete-node/ &storage_partition; -/delete-node/ &scratch_partition; - -&flash0 { - /* - * For more information, see: - * https://docs.zephyrproject.org/latest/guides/dts/legacy-macros.html#legacy-flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@70000 { - label = "storage"; - reg = <0x00070000 0x10000>; - }; - }; -}; diff --git a/tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay b/tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 79fe994db06..00000000000 --- a/tests/subsys/settings/fcb/base64/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/delete-node/ &storage_partition; -/delete-node/ &scratch_partition; - -&flash0 { - /* - * For more information, see: - * https://docs.zephyrproject.org/latest/guides/dts/legacy-macros.html#legacy-flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@de000 { - label = "storage"; - reg = <0x000de000 0x00010000>; - }; - }; -}; diff --git a/tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay b/tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay deleted file mode 100644 index d9749818a62..00000000000 --- a/tests/subsys/settings/fcb/base64/nrf52dk_nrf52832.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2018 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/delete-node/ &storage_partition; -/delete-node/ &scratch_partition; - -&flash0 { - /* - * For more information, see: - * https://docs.zephyrproject.org/latest/guides/dts/legacy-macros.html#legacy-flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@70000 { - label = "storage"; - reg = <0x00070000 0x10000>; - }; - }; -}; diff --git a/tests/subsys/settings/fcb/base64/placeholder.c b/tests/subsys/settings/fcb/base64/placeholder.c deleted file mode 100644 index d7350bf052f..00000000000 --- a/tests/subsys/settings/fcb/base64/placeholder.c +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ -/* Copyright (c) 2019 Intel Corporation */ diff --git a/tests/subsys/settings/fcb/base64/prj.conf b/tests/subsys/settings/fcb/base64/prj.conf deleted file mode 100644 index c328a2a3ed2..00000000000 --- a/tests/subsys/settings/fcb/base64/prj.conf +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_ARM_MPU=n -CONFIG_FCB=y - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/fcb/base64/prj_native_posix.conf b/tests/subsys/settings/fcb/base64/prj_native_posix.conf deleted file mode 100644 index 4c167fd63b8..00000000000 --- a/tests/subsys/settings/fcb/base64/prj_native_posix.conf +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_FCB=y - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/fcb/base64/prj_native_posix_64.conf b/tests/subsys/settings/fcb/base64/prj_native_posix_64.conf deleted file mode 100644 index 4c167fd63b8..00000000000 --- a/tests/subsys/settings/fcb/base64/prj_native_posix_64.conf +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_ZTEST=y -CONFIG_STDOUT_CONSOLE=y -CONFIG_FLASH=y -CONFIG_FLASH_PAGE_LAYOUT=y -CONFIG_FLASH_MAP=y -CONFIG_FCB=y - -CONFIG_SETTINGS=y -CONFIG_SETTINGS_RUNTIME=y -CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/fcb/base64/testcase.yaml b/tests/subsys/settings/fcb/base64/testcase.yaml deleted file mode 100644 index 760348241b7..00000000000 --- a/tests/subsys/settings/fcb/base64/testcase.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tests: - system.settings.fcb.base64: - platform_allow: nrf52840dk_nrf52840 nrf52dk_nrf52832 native_posix native_posix_64 - tags: settings_fcb diff --git a/tests/subsys/settings/fcb/raw/prj.conf b/tests/subsys/settings/fcb/raw/prj.conf index 767305cd621..198a54c4d1a 100644 --- a/tests/subsys/settings/fcb/raw/prj.conf +++ b/tests/subsys/settings/fcb/raw/prj.conf @@ -9,4 +9,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/fcb/raw/prj_native_posix.conf b/tests/subsys/settings/fcb/raw/prj_native_posix.conf index 07595f0fd6e..af30118d4a3 100644 --- a/tests/subsys/settings/fcb/raw/prj_native_posix.conf +++ b/tests/subsys/settings/fcb/raw/prj_native_posix.conf @@ -8,4 +8,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/fcb/raw/prj_native_posix_64.conf b/tests/subsys/settings/fcb/raw/prj_native_posix_64.conf index 07595f0fd6e..af30118d4a3 100644 --- a/tests/subsys/settings/fcb/raw/prj_native_posix_64.conf +++ b/tests/subsys/settings/fcb/raw/prj_native_posix_64.conf @@ -8,4 +8,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/fcb/src/settings_test_fcb.c b/tests/subsys/settings/fcb/src/settings_test_fcb.c index 8764cb98ccb..1021f789675 100644 --- a/tests/subsys/settings/fcb/src/settings_test_fcb.c +++ b/tests/subsys/settings/fcb/src/settings_test_fcb.c @@ -379,13 +379,6 @@ void test_config_save_fcb_unaligned(void); void test_main(void) { -#ifdef CONFIG_SETTINGS_USE_BASE64 - ztest_test_suite(test_config_fcb_base64, - ztest_unit_test(test_settings_encode), - ztest_unit_test(test_setting_raw_read), - ztest_unit_test(test_setting_val_read)); - ztest_run_test_suite(test_config_fcb_base64); -#endif ztest_test_suite(test_config_fcb, /* Config tests */ ztest_unit_test(config_empty_lookups), diff --git a/tests/subsys/settings/fs/src/settings_test_compress_file.c b/tests/subsys/settings/fs/src/settings_test_compress_file.c index 1fdc342aeab..076540e394b 100644 --- a/tests/subsys/settings/fs/src/settings_test_compress_file.c +++ b/tests/subsys/settings/fs/src/settings_test_compress_file.c @@ -10,15 +10,6 @@ #include "settings_test.h" #include "settings/settings_file.h" -#ifdef CONFIG_SETTINGS_USE_BASE64 -#define EXP_STR_CONTENT_1 "\x12\x00myfoo/mybar16=AAE="\ - "\x10\x00myfoo/mybar=FA=="\ - "\x1A\x00myfoo/mybar64=JQAAAAAAAAA=" - -#define EXP_STR_CONTENT_2 "\x10\x00myfoo/mybar=FA=="\ - "\x12\x00myfoo/mybar16=AQE="\ - "\x1A\x00myfoo/mybar64=EwAAAAAAAAA=" -#else #define EXP_STR_CONTENT_1 "\x10\x00myfoo/mybar16=\x00\x01"\ "\x0d\x00myfoo/mybar=\x14"\ "\x16\x00myfoo/mybar64=\x25\x00\x00\x00\x00\x00\x00\x00" @@ -26,7 +17,6 @@ #define EXP_STR_CONTENT_2 "\x0d\x00myfoo/mybar=\x14"\ "\x10\x00myfoo/mybar16=\x01\x01"\ "\x16\x00myfoo/mybar64=\x13\x00\x00\x00\x00\x00\x00\x00" -#endif int file_str_cmp(const char *fname, char const *string, size_t pattern_len); diff --git a/tests/subsys/settings/fs/src/settings_test_multiple_in_file.c b/tests/subsys/settings/fs/src/settings_test_multiple_in_file.c index de82c749cc2..7892ebc928e 100644 --- a/tests/subsys/settings/fs/src/settings_test_multiple_in_file.c +++ b/tests/subsys/settings/fs/src/settings_test_multiple_in_file.c @@ -8,17 +8,10 @@ #include "settings_test.h" #include "settings/settings_file.h" -#ifdef CONFIG_SETTINGS_USE_BASE64 -#define CF_MFG_TEST1 "\x10\x00myfoo/mybar=AQ=="\ - "\x10\x00myfoo/mybar=Dg==" -#define CF_MFG_TEST2 "\x10\x00myfoo/mybar=AQ=="\ - "\x10\x00myfoo/mybar=Dw==" -#else #define CF_MFG_TEST1 "\x0d\x00myfoo/mybar=\x01"\ "\x0d\x00myfoo/mybar=\x0e" #define CF_MFG_TEST2 "\x0d\x00myfoo/mybar=\x01"\ "\x0d\x00myfoo/mybar=\x0f" -#endif void test_config_multiple_in_file(void) { diff --git a/tests/subsys/settings/fs/src/settings_test_save_in_file.c b/tests/subsys/settings/fs/src/settings_test_save_in_file.c index d49f1ac83b5..a20b43cf3d1 100644 --- a/tests/subsys/settings/fs/src/settings_test_save_in_file.c +++ b/tests/subsys/settings/fs/src/settings_test_save_in_file.c @@ -8,13 +8,8 @@ #include "settings_test.h" #include "settings/settings_file.h" -#ifdef CONFIG_SETTINGS_USE_BASE64 -#define CF_FILE_CONTENT_1 "\x10\x00myfoo/mybar=CA==" -#define CF_FILE_CONTENT_2 "\x10\x00myfoo/mybar=Kw==" -#else #define CF_FILE_CONTENT_1 "\x0d\x00myfoo/mybar=\x08" #define CF_FILE_CONTENT_2 "\x0d\x00myfoo/mybar=\x2b" -#endif void test_config_save_in_file(void) { diff --git a/tests/subsys/settings/fs/src/settings_test_small_file.c b/tests/subsys/settings/fs/src/settings_test_small_file.c index f754fe7f165..8c319eecca1 100644 --- a/tests/subsys/settings/fs/src/settings_test_small_file.c +++ b/tests/subsys/settings/fs/src/settings_test_small_file.c @@ -8,13 +8,8 @@ #include "settings_test.h" #include "settings/settings_file.h" -#ifdef CONFIG_SETTINGS_USE_BASE64 -#define CF_MFG_TEST_STR "\x10\x00myfoo/mybar=AQ==" -#define CF_RUNNING_TEST_STR "\x10\x00myfoo/mybar=CA==" -#else #define CF_MFG_TEST_STR "\x0D\x00myfoo/mybar=\x01" #define CF_RUNNING_TEST_STR "\x0D\x00myfoo/mybar=\x08" -#endif void test_config_small_file(void) { diff --git a/tests/subsys/settings/functional/fcb/prj.conf b/tests/subsys/settings/functional/fcb/prj.conf index 767305cd621..198a54c4d1a 100644 --- a/tests/subsys/settings/functional/fcb/prj.conf +++ b/tests/subsys/settings/functional/fcb/prj.conf @@ -9,4 +9,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/functional/fcb/prj_native_posix.conf b/tests/subsys/settings/functional/fcb/prj_native_posix.conf index 07595f0fd6e..af30118d4a3 100644 --- a/tests/subsys/settings/functional/fcb/prj_native_posix.conf +++ b/tests/subsys/settings/functional/fcb/prj_native_posix.conf @@ -8,4 +8,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/functional/fcb/prj_native_posix_64.conf b/tests/subsys/settings/functional/fcb/prj_native_posix_64.conf index 07595f0fd6e..af30118d4a3 100644 --- a/tests/subsys/settings/functional/fcb/prj_native_posix_64.conf +++ b/tests/subsys/settings/functional/fcb/prj_native_posix_64.conf @@ -8,4 +8,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/functional/fcb/prj_qemu_x86.conf b/tests/subsys/settings/functional/fcb/prj_qemu_x86.conf index 07595f0fd6e..af30118d4a3 100644 --- a/tests/subsys/settings/functional/fcb/prj_qemu_x86.conf +++ b/tests/subsys/settings/functional/fcb/prj_qemu_x86.conf @@ -8,4 +8,3 @@ CONFIG_FCB=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FCB=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/functional/file/prj.conf b/tests/subsys/settings/functional/file/prj.conf index 27f0b64f98f..cd4bac800ab 100644 --- a/tests/subsys/settings/functional/file/prj.conf +++ b/tests/subsys/settings/functional/file/prj.conf @@ -12,7 +12,6 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n CONFIG_SETTINGS_FS_DIR="/ff/settings" CONFIG_SETTINGS_FS_FILE="/ff/settings/run" diff --git a/tests/subsys/settings/functional/file/prj_native_posix.conf b/tests/subsys/settings/functional/file/prj_native_posix.conf index 89fe1abce4f..322e1f48061 100644 --- a/tests/subsys/settings/functional/file/prj_native_posix.conf +++ b/tests/subsys/settings/functional/file/prj_native_posix.conf @@ -10,7 +10,6 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y CONFIG_SETTINGS_FS_DIR="/ff/settings" CONFIG_SETTINGS_FS_FILE="/ff/settings/run" diff --git a/tests/subsys/settings/functional/file/prj_native_posix_64.conf b/tests/subsys/settings/functional/file/prj_native_posix_64.conf index e8d0662050a..322e1f48061 100644 --- a/tests/subsys/settings/functional/file/prj_native_posix_64.conf +++ b/tests/subsys/settings/functional/file/prj_native_posix_64.conf @@ -10,7 +10,6 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n CONFIG_SETTINGS_FS_DIR="/ff/settings" CONFIG_SETTINGS_FS_FILE="/ff/settings/run" diff --git a/tests/subsys/settings/functional/file/prj_qemu_x86.conf b/tests/subsys/settings/functional/file/prj_qemu_x86.conf index e8d0662050a..322e1f48061 100644 --- a/tests/subsys/settings/functional/file/prj_qemu_x86.conf +++ b/tests/subsys/settings/functional/file/prj_qemu_x86.conf @@ -10,7 +10,6 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n CONFIG_SETTINGS_FS_DIR="/ff/settings" CONFIG_SETTINGS_FS_FILE="/ff/settings/run" diff --git a/tests/subsys/settings/functional/nvs/prj.conf b/tests/subsys/settings/functional/nvs/prj.conf index e829f3c9932..e5e1f6b4089 100644 --- a/tests/subsys/settings/functional/nvs/prj.conf +++ b/tests/subsys/settings/functional/nvs/prj.conf @@ -8,4 +8,3 @@ CONFIG_NVS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_NVS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/littlefs/base64/prj.conf b/tests/subsys/settings/littlefs/base64/prj.conf index b0bf89abfea..cbd39b49d9f 100644 --- a/tests/subsys/settings/littlefs/base64/prj.conf +++ b/tests/subsys/settings/littlefs/base64/prj.conf @@ -18,4 +18,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/littlefs/base64/prj_native_posix.conf b/tests/subsys/settings/littlefs/base64/prj_native_posix.conf index 430baf3d6d8..d84ca27942f 100644 --- a/tests/subsys/settings/littlefs/base64/prj_native_posix.conf +++ b/tests/subsys/settings/littlefs/base64/prj_native_posix.conf @@ -17,4 +17,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/littlefs/base64/prj_native_posix_64.conf b/tests/subsys/settings/littlefs/base64/prj_native_posix_64.conf index a10f56119f7..07ff7f9871c 100644 --- a/tests/subsys/settings/littlefs/base64/prj_native_posix_64.conf +++ b/tests/subsys/settings/littlefs/base64/prj_native_posix_64.conf @@ -17,4 +17,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=y diff --git a/tests/subsys/settings/littlefs/raw/prj.conf b/tests/subsys/settings/littlefs/raw/prj.conf index b27af6505f9..cbd39b49d9f 100644 --- a/tests/subsys/settings/littlefs/raw/prj.conf +++ b/tests/subsys/settings/littlefs/raw/prj.conf @@ -18,4 +18,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/littlefs/raw/prj_native_posix.conf b/tests/subsys/settings/littlefs/raw/prj_native_posix.conf index 545ec30e08b..d84ca27942f 100644 --- a/tests/subsys/settings/littlefs/raw/prj_native_posix.conf +++ b/tests/subsys/settings/littlefs/raw/prj_native_posix.conf @@ -17,4 +17,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/littlefs/raw/prj_native_posix_64.conf b/tests/subsys/settings/littlefs/raw/prj_native_posix_64.conf index 51de5ad0692..07ff7f9871c 100644 --- a/tests/subsys/settings/littlefs/raw/prj_native_posix_64.conf +++ b/tests/subsys/settings/littlefs/raw/prj_native_posix_64.conf @@ -17,4 +17,3 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_FS=y -CONFIG_SETTINGS_USE_BASE64=n diff --git a/tests/subsys/settings/nvs/raw/prj.conf b/tests/subsys/settings/nvs/raw/prj.conf index e829f3c9932..e5e1f6b4089 100644 --- a/tests/subsys/settings/nvs/raw/prj.conf +++ b/tests/subsys/settings/nvs/raw/prj.conf @@ -8,4 +8,3 @@ CONFIG_NVS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_RUNTIME=y CONFIG_SETTINGS_NVS=y -CONFIG_SETTINGS_USE_BASE64=n