summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Swierczek <t.swierczek@samsung.com>2024-06-05 13:18:07 +0200
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>2024-06-06 10:33:52 +0000
commit13846d325d4ca50d152b61a6af38a3eedcffd0af (patch)
tree3871eea0ecdc49943ace0973adcc5d59a1a40ec3
parent564f828aca4ce88a435da3887db3d02ca85f7cc9 (diff)
downloadkey-manager-13846d325d4ca50d152b61a6af38a3eedcffd0af.tar.gz
key-manager-13846d325d4ca50d152b61a6af38a3eedcffd0af.tar.bz2
key-manager-13846d325d4ca50d152b61a6af38a3eedcffd0af.zip
Fix warning & issues from gcc14 compiler
Change-Id: Ia762c409607ae39a74f5b6af1e5a987579719465
-rw-r--r--src/manager/crypto/sw-backend/internals.cpp6
-rw-r--r--src/manager/main/socket-manager.h3
-rw-r--r--src/manager/service/ss-migrate.cpp13
-rw-r--r--src/manager/sqlcipher/CMakeLists.txt4
4 files changed, 10 insertions, 16 deletions
diff --git a/src/manager/crypto/sw-backend/internals.cpp b/src/manager/crypto/sw-backend/internals.cpp
index c5174a70..ce0e7e3f 100644
--- a/src/manager/crypto/sw-backend/internals.cpp
+++ b/src/manager/crypto/sw-backend/internals.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2020 Samsung Electronics Co., Ltd. All rights reserved
+ * Copyright (c) 2015-2024 Samsung Electronics Co., Ltd. All rights reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1084,8 +1084,8 @@ Data deriveKBKDF(const RawBuffer &secret, const CryptoAlgorithm &alg)
validateParams<IsKbkdf>(alg);
RawBuffer label, context, fixed;
- KbkdfCounterLocation counterLocation;
- KdfPrf prf;
+ KbkdfCounterLocation counterLocation = KbkdfCounterLocation::BEFORE_FIXED;
+ KdfPrf prf = KdfPrf::HMAC_SHA256;
size_t length, rlenBits = 32, llenBits = 32, tmp;
bool hasLabel = alg.getParam(ParamName::KBKDF_LABEL, label);
bool hasContext = alg.getParam(ParamName::KBKDF_CONTEXT, context);
diff --git a/src/manager/main/socket-manager.h b/src/manager/main/socket-manager.h
index 1c7e295c..b9d0795d 100644
--- a/src/manager/main/socket-manager.h
+++ b/src/manager/main/socket-manager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 - 2021 Samsung Electronics Co., Ltd. All rights reserved
+ * Copyright (c) 2014 - 2024 Samsung Electronics Co., Ltd. All rights reserved
*
* Contact: Dongsun Lee <ds73.lee@samsung.com>
*
@@ -26,6 +26,7 @@
#ifndef _CENT_KEY_MNG_SOCKET_MANAGER_
#define _CENT_KEY_MNG_SOCKET_MANAGER_
+#include <algorithm>
#include <vector>
#include <queue>
#include <deque>
diff --git a/src/manager/service/ss-migrate.cpp b/src/manager/service/ss-migrate.cpp
index 88f2cbf4..e3f7dc60 100644
--- a/src/manager/service/ss-migrate.cpp
+++ b/src/manager/service/ss-migrate.cpp
@@ -82,7 +82,7 @@ inline void remove_path(const std::string &path, bool isAdminUser)
// depth 0 -> OLD_SS_DIR
// 1 -> group dir in OLD_SS_DIR
-void visit_dir(const std::string &dirpath, struct dirent *buf, size_t depth,
+void visit_dir(const std::string &dirpath, size_t depth,
const Saver &saver, bool isAdminUser)
{
if (depth > 1) {
@@ -123,7 +123,7 @@ void visit_dir(const std::string &dirpath, struct dirent *buf, size_t depth,
"group storage: " << dirpath);
} else {
std::string subdir = dirpath + "/" + name;
- visit_dir(subdir, buf, depth + 1, saver, isAdminUser);
+ visit_dir(subdir, depth + 1, saver, isAdminUser);
continue;
}
} else if (result->d_type == DT_REG) {
@@ -178,14 +178,7 @@ void migrate(bool isAdminUser, const Saver &saver)
return;
}
- auto bufptr = uptr<::free>(
- static_cast<struct dirent *>(::malloc(
- offsetof(struct dirent, d_name) + NAME_MAX + 1)));
-
- if (bufptr == nullptr)
- throw std::bad_alloc();
-
- visit_dir(OLD_SS_DIR, bufptr.get(), 0, saver, isAdminUser);
+ visit_dir(OLD_SS_DIR, 0, saver, isAdminUser);
}
} // namespace SsMigration
diff --git a/src/manager/sqlcipher/CMakeLists.txt b/src/manager/sqlcipher/CMakeLists.txt
index dd7c6543..7ee930a3 100644
--- a/src/manager/sqlcipher/CMakeLists.txt
+++ b/src/manager/sqlcipher/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Samsung Electronics Co., Ltd. All rights reserved
+# Copyright (c) 2020-2024 Samsung Electronics Co., Ltd. All rights reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ ADD_LIBRARY(
SET_TARGET_PROPERTIES(
${DUMP_LEGACY_DB_LIBNAME}
PROPERTIES
- COMPILE_FLAGS "-fvisibility=hidden -Wl,--no-undefined"
+ COMPILE_FLAGS "-fvisibility=hidden -Wl,--no-undefined,-Wno-return-local-addr"
)
INSTALL(