memzero.h: Move memzero() and strzero() to their own header

Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ca73313dc242f103c9d00918b3644e60ca5f6286..e778004e7e392ff6b6c15c8f46b44d639f1ac186 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -85,6 +85,7 @@ libshadow_la_SOURCES = \
        mail.c \
        mempcpy.c \
        mempcpy.h \
+       memzero.h \
        motd.c \
        myname.c \
        nss.c \

diff --git a/lib/commonio.c b/lib/commonio.c
index c6459a2ec0586540049b46fb9dd720e3d2010f09..6d744ad142a5782efebd0617d35ff7b6b5b85468 100644 (file)
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -23,6 +23,7 @@
 #include <signal.h>
 
 #include "alloc.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #ifdef WITH_TCB

diff --git a/lib/defines.h b/lib/defines.h
index b289a72dfff8ae722658c6c7584fce1520f101db..a24a0c7d3e2c66e3ffde9e1bc93d0db22afb470f 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -47,20 +47,6 @@
 #include <sys/time.h>
 #include <time.h>
 
-#ifdef HAVE_MEMSET_EXPLICIT
-# define memzero(ptr, size) memset_explicit((ptr), 0, (size))
-#elif defined HAVE_EXPLICIT_BZERO      /* !HAVE_MEMSET_S */
-# define memzero(ptr, size) explicit_bzero((ptr), (size))
-#else                                  /* !HAVE_MEMSET_S && HAVE_EXPLICIT_BZERO */
-static inline void memzero(void *ptr, size_t size)
-{
-       ptr = memset(ptr, '\0', size);
-       __asm__ __volatile__ ("" : : "r"(ptr) : "memory");
-}
-#endif                                 /* !HAVE_MEMSET_S && !HAVE_EXPLICIT_BZERO */
-
-#define strzero(s) memzero(s, strlen(s))       /* warning: evaluates twice */
-
 #include <dirent.h>
 
 /*

diff --git a/lib/failure.c b/lib/failure.c
index 205eec9cabe048ef8d503753a7d9795f95d5e2b6..1d2d910ab2611c1082cd5b7df0d8c90b166f1dbf 100644 (file)
--- a/lib/failure.c
+++ b/lib/failure.c
@@ -17,7 +17,10 @@
 #include "defines.h"
 #include "faillog.h"
 #include "failure.h"
+#include "memzero.h"
 #include "prototypes.h"
+
+
 #define        YEAR    (365L*DAY)
 /*
  * failure - make failure entry

diff --git a/lib/groupmem.c b/lib/groupmem.c
index a1e18dca050afb8a0d5cf4baae5e29aa946326fe..271724fbd5362ef38cb600f24d1ed3d5ee54b980 100644 (file)
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -13,6 +13,7 @@
 #ident "$Id$"
 
 #include "alloc.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "groupio.h"

diff --git a/lib/limits.c b/lib/limits.c
index ef8cb92096e8e344578677bfc421047826fc873c..96998e9e813f641a84036089be6a70381c130e58 100644 (file)
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -29,6 +29,7 @@
 #include "getdef.h"
 #include "shadowlog.h"
 #include <sys/resource.h>
+#include "memzero.h"
 #ifndef LIMITS_FILE
 #define LIMITS_FILE "/etc/limits"
 #endif

diff --git a/lib/log.c b/lib/log.c
index fb867b274c2951421c0cfc1693996a3fc56467c9..8b3e564e5c3e0e2b2d350797bbf013864cdd13b0 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include "defines.h"
 #include <lastlog.h>
+#include "memzero.h"
 #include "prototypes.h"
 
 /*

diff --git a/lib/loginprompt.c b/lib/loginprompt.c
index d1af0e3989fe5d800dd92e7b231e6896d5076af5..bf8c3cdda706eb9d2fa39425a2c785a6c6d95746 100644 (file)
--- a/lib/loginprompt.c
+++ b/lib/loginprompt.c
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "alloc.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"

diff --git a/lib/memzero.h b/lib/memzero.h
new file mode 100644 (file)
index 0000000..00000b9
--- /dev/null
+++ b/lib/memzero.h
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+
+#ifndef SHADOW_INCLUDE_LIBMISC_MEMZERO_H_
+#define SHADOW_INCLUDE_LIBMISC_MEMZERO_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+#include <string.h>
+#include <strings.h>
+
+
+#ifdef HAVE_MEMSET_EXPLICIT
+# define memzero(ptr, size) memset_explicit((ptr), 0, (size))
+#elif defined HAVE_EXPLICIT_BZERO      /* !HAVE_MEMSET_S */
+# define memzero(ptr, size) explicit_bzero((ptr), (size))
+#else                                  /* !HAVE_MEMSET_S && HAVE_EXPLICIT_BZERO */
+static inline void memzero(void *ptr, size_t size)
+{
+       ptr = memset(ptr, '\0', size);
+       __asm__ __volatile__ ("" : : "r"(ptr) : "memory");
+}
+#endif                                 /* !HAVE_MEMSET_S && !HAVE_EXPLICIT_BZERO */
+
+#define strzero(s) memzero(s, strlen(s))       /* warning: evaluates twice */
+
+
+#endif  // include guard

diff --git a/lib/obscure.c b/lib/obscure.c
index 88a87735616904d23ae870d4092a27cc0f4f9bdb..ccffb71db1ae4a779420848e2d548148236deb98 100644 (file)
--- a/lib/obscure.c
+++ b/lib/obscure.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include "alloc.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"

diff --git a/lib/pwauth.c b/lib/pwauth.c
index df67b04e13be454ad42e38e0308fa8009b7555ed..693b3b7df4f001c240237875b446d791d6bd5fb1 100644 (file)
--- a/lib/pwauth.c
+++ b/lib/pwauth.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include "prototypes.h"
 #include "defines.h"
+#include "memzero.h"
 #include "pwauth.h"
 #include "getdef.h"
 #ifdef SKEY

diff --git a/lib/pwmem.c b/lib/pwmem.c
index 4e966a4249bf76d63cd6a4a3e42fc803a25ed93d..3d868a850b7c7c6e3afe68f9bca807f3f4c2d694 100644 (file)
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -16,6 +16,7 @@
 
 #include "alloc.h"
 #include "defines.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "pwio.h"
 

diff --git a/lib/sgroupio.c b/lib/sgroupio.c
index 02ff95a11f6ad3b0f5c206ae66b6d43f32a79554..cbbdff7889d58d5e7a11b6b4157761b22bc732b0 100644 (file)
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -19,6 +19,7 @@
 #include "defines.h"
 #include "commonio.h"
 #include "getdef.h"
+#include "memzero.h"
 #include "sgroupio.h"
 
 /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent)

diff --git a/lib/shadowmem.c b/lib/shadowmem.c
index 93bcb12dde4ab00a175998fc6f4f5de9b6529eea..c3c7c4cc34d50a6ba66be6ac8031600ac410bd87 100644 (file)
--- a/lib/shadowmem.c
+++ b/lib/shadowmem.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 
 #include "alloc.h"
+#include "memzero.h"
 #include "shadowio.h"
 
 /*@null@*/ /*@only@*/struct spwd *__spw_dup (const struct spwd *spent)

diff --git a/src/chage.c b/src/chage.c
index b11ed3d8985bdc2772983fb8cb42ab7044c067ab..b8a11e8c4a61a6bbb7683c0f87220aa57cdaf771 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -29,6 +29,7 @@
 #include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
+#include "memzero.h"
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"

diff --git a/src/faillog.c b/src/faillog.c
index 1fee5c9b0afe6a2b8f4e5988294b9a5c53ee46ca..ab60775a440811867b80f071584e2a7c1edc746f 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -20,6 +20,7 @@
 #include <assert.h>
 #include "defines.h"
 #include "faillog.h"
+#include "memzero.h"
 #include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 3b76ff8ed19d5a28fc4472b655a0889fd28a4899..853cb03ae2953e6fabcfc8930aee8f184e6b2de7 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -23,6 +23,7 @@
 #include "alloc.h"
 #include "defines.h"
 #include "groupio.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"

diff --git a/src/groupadd.c b/src/groupadd.c
index 2eda1c68045d90b3fe6f8aaec88997afbcfec9d5..462a4ccd2ee5aeda7d14f14c64fa12a5ab7a59d1 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -27,6 +27,7 @@
 #include "defines.h"
 #include "getdef.h"
 #include "groupio.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"

diff --git a/src/lastlog.c b/src/lastlog.c
index 1db668871b36fbb8504d52c5f14e11604a22a7e0..cd80de2e82ac80f52aab6d63904a7c3188538b26 100644 (file)
--- a/src/lastlog.c
+++ b/src/lastlog.c
@@ -25,6 +25,7 @@
 #include "defines.h"
 #include "prototypes.h"
 #include "getdef.h"
+#include "memzero.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"

diff --git a/src/login.c b/src/login.c
index 8a109801b3b319768b63c4f58f4e9ffb1d08250f..84002232d4840b103835b9d4052fd1cb52254cb3 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -30,6 +30,7 @@
 #include "faillog.h"
 #include "failure.h"
 #include "getdef.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "pwauth.h"
 /*@-exitarg@*/

diff --git a/src/passwd.c b/src/passwd.c
index 5d59e8c4b6bdd74756801f0605a1202c43e4acc4..a89790db6157b7fc1c3fb11cfae35b13abd5371e 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -23,6 +23,7 @@
 #include "alloc.h"
 #include "defines.h"
 #include "getdef.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"

diff --git a/src/sulogin.c b/src/sulogin.c
index 080b92f107e51d182cb7a2e5c1f007cd6af01ec0..14bec6ae71b63d7bb3a86f5a49795b4e329f31ce 100644 (file)
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -18,6 +18,7 @@
 #include <sys/ioctl.h>
 #include "defines.h"
 #include "getdef.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "pwauth.h"
 /*@-exitarg@*/

diff --git a/src/useradd.c b/src/useradd.c
index 11d0bc9cb4b97b902415eb81aa83e472573b21b5..76a4d6495edda1713fcc5ec2335b54a6bc4a45c8 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -42,6 +42,7 @@
 #include "faillog.h"
 #include "getdef.h"
 #include "groupio.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"

diff --git a/src/usermod.c b/src/usermod.c
index 61cd11a8dcee8a884ba7db343ee078f182c20a21..72a98f1f8ea2c3499d1e628cbbe7700f18131dfe 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -37,6 +37,7 @@
 #include "faillog.h"
 #include "getdef.h"
 #include "groupio.h"
+#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"