summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibCore
diff options
context:
space:
mode:
authorMustafa Quraish <mustafaq9@gmail.com>2021-09-12 12:47:00 -0400
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-09-12 17:11:45 +0000
commit500a3fb2a7a126fd2cf74eac3bc342e87549eb2c (patch)
tree4b23df6d6ded04a7a5a774b0e526c68f80b7cc9b /Userland/Libraries/LibCore
parent871ef7a73570a9af55af770437922fd229156c83 (diff)
downloadserenity-500a3fb2a7a126fd2cf74eac3bc342e87549eb2c.zip
Core/SecretString: Use `memset_s` instead of `explicit_bzero` on MacOS
MacOS doesn't have `explicit_bzero`, so this was causing errors when compiling LibCore on the host.
Diffstat (limited to 'Userland/Libraries/LibCore')
-rw-r--r--Userland/Libraries/LibCore/SecretString.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/Userland/Libraries/LibCore/SecretString.cpp b/Userland/Libraries/LibCore/SecretString.cpp
index 398aa96300..890e9e5d76 100644
--- a/Userland/Libraries/LibCore/SecretString.cpp
+++ b/Userland/Libraries/LibCore/SecretString.cpp
@@ -1,10 +1,15 @@
/*
* Copyright (c) 2021, Brian Gianforcaro <bgianf@serenityos.org>
+ * Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <AK/Platform.h>
#include <LibCore/SecretString.h>
+#if defined(AK_OS_MACOS)
+# define __STDC_WANT_LIB_EXT1__ 1
+#endif
#include <string.h>
namespace Core {
@@ -14,7 +19,11 @@ SecretString SecretString::take_ownership(char*& cstring, size_t length)
auto buffer = ByteBuffer::copy(cstring, length);
VERIFY(buffer.has_value());
+#if defined(AK_OS_MACOS)
+ memset_s(cstring, length, 0, length);
+#else
explicit_bzero(cstring, length);
+#endif
free(cstring);
return SecretString(buffer.release_value());
@@ -32,10 +41,14 @@ SecretString::SecretString(ByteBuffer&& buffer)
SecretString::~SecretString()
{
+ // Note: We use explicit_bzero to avoid the zeroing from being optimized out by the compiler,
+ // which is possible if memset was to be used here.
if (!m_secure_buffer.is_empty()) {
- // Note: We use explicit_bzero to avoid the zeroing from being optimized out by the compiler,
- // which is possible if memset was to be used here.
+#if defined(AK_OS_MACOS)
+ memset_s(m_secure_buffer.data(), m_secure_buffer.size(), 0, m_secure_buffer.size());
+#else
explicit_bzero(m_secure_buffer.data(), m_secure_buffer.capacity());
+#endif
}
}