shared: rename crypt-util.c → cryptsetup-util.c

"crypt-util.c" is such a generic name, let's avoid that, in particular
as libc's/libcrypt's crypt() function is so generically named too that
one might thing this is about that. Let's hence be more precise, and
make clear that this is about cryptsetup, and nothing else.

We already had cryptsetup-util.[ch] in src/cryptsetup/ doing keyfile
management. To avoid the needless confusion, let's rename that file to
cryptsetup-keyfile.[ch].

diff --git a/meson.build b/meson.build
index 217b17423bc109c44f68373a10f03babebb147d4..889669b5d2d67c3d78dd4930697bc80d884065cc 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2272,8 +2272,8 @@ executable(
 if conf.get('HAVE_LIBCRYPTSETUP') == 1
         systemd_cryptsetup_sources = files('''
                 src/cryptsetup/cryptsetup-pkcs11.h
-                src/cryptsetup/cryptsetup-util.c
-                src/cryptsetup/cryptsetup-util.h
+                src/cryptsetup/cryptsetup-keyfile.c
+                src/cryptsetup/cryptsetup-keyfile.h
                 src/cryptsetup/cryptsetup.c
 '''.split())
 

diff --git a/src/cryptsetup/cryptsetup-util.c b/src/cryptsetup/cryptsetup-keyfile.c
similarity index 99%
rename from src/cryptsetup/cryptsetup-util.c
rename to src/cryptsetup/cryptsetup-keyfile.c
index 8ae70a5d10e6019d5387b69a4b26bc5beb223130..ebf4cb1b6b02d1b5afab075b961f279b2fece4a7 100644 (file)
--- a/src/cryptsetup/cryptsetup-util.c
+++ b/src/cryptsetup/cryptsetup-keyfile.c
@@ -2,7 +2,7 @@
 
 #include <unistd.h>
 
-#include "cryptsetup-util.h"
+#include "cryptsetup-keyfile.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "memory-util.h"

diff --git a/src/cryptsetup/cryptsetup-util.h b/src/cryptsetup/cryptsetup-keyfile.h
similarity index 100%
rename from src/cryptsetup/cryptsetup-util.h
rename to src/cryptsetup/cryptsetup-keyfile.h

diff --git a/src/cryptsetup/cryptsetup-pkcs11.c b/src/cryptsetup/cryptsetup-pkcs11.c
index 642a1b7d11a8843732d9e781d4e9e91830cc1d44..bbc0122002248734362f229888c55c9d02e7eb48 100644 (file)
--- a/src/cryptsetup/cryptsetup-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-pkcs11.c
@@ -10,7 +10,7 @@
 #include "alloc-util.h"
 #include "ask-password-api.h"
 #include "cryptsetup-pkcs11.h"
-#include "cryptsetup-util.h"
+#include "cryptsetup-keyfile.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "format-util.h"

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 8be9c9acac9fb409d01a0da40d6e069e752d834e..f9e627da462eb853a4431eaaa55135e051c086f6 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -11,7 +11,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
-#include "crypt-util.h"
+#include "cryptsetup-keyfile.h"
 #include "cryptsetup-pkcs11.h"
 #include "cryptsetup-util.h"
 #include "device-util.h"

diff --git a/src/home/homework-luks.h b/src/home/homework-luks.h
index 4d3e085ff004f6dfccf1526f1456bc0ae5651118..af0ad4b5043c9421e9cdc0fac4b4aeab31079dc0 100644 (file)
--- a/src/home/homework-luks.h
+++ b/src/home/homework-luks.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "homework.h"
 #include "user-record.h"
 

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 2728cb8ba8c2216da478f728751a04a132a84346..daadf9ef43758c9a4b5afc380d9693c1d18f27a9 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -11,7 +11,7 @@
 #include <sys/vfs.h>
 
 #include "blockdev-util.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "device-nodes.h"
 #include "dissect-image.h"
 #include "escape.h"

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 96c4e809aebc4e00e74178517dee613acdd67887..5ddfdfa63532e658eee1962393604f34a99f2b2c 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -24,7 +24,7 @@
 #include "btrfs-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "def.h"
 #include "efivars.h"
 #include "errno-util.h"

diff --git a/src/shared/crypt-util.c b/src/shared/cryptsetup-util.c
similarity index 96%
rename from src/shared/crypt-util.c
rename to src/shared/cryptsetup-util.c
index 52bd12bb8da1c3e7c75f8b40ed6c5e6efc8fcc63..9bc85a173901f0d01e0fcc188919fadf4260a72b 100644 (file)
--- a/src/shared/crypt-util.c
+++ b/src/shared/cryptsetup-util.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #if HAVE_LIBCRYPTSETUP
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "log.h"
 
 static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {

diff --git a/src/shared/crypt-util.h b/src/shared/cryptsetup-util.h
similarity index 100%
rename from src/shared/crypt-util.h
rename to src/shared/cryptsetup-util.h

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 9bcab8445e2107c4590e8f1799636171884c3954..a035e8de5a2658e73810e18e537e2dbe62d49bf9 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -19,7 +19,7 @@
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "copy.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "def.h"
 #include "device-nodes.h"
 #include "device-util.h"

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 572ac1de64ed339193f6e52759e5a528f426144b..5416c68bf5917edc6c3e80d5642133251451e54a 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -73,8 +73,8 @@ shared_sources = files('''
         coredump-util.h
         cpu-set-util.c
         cpu-set-util.h
-        crypt-util.c
-        crypt-util.h
+        cryptsetup-util.c
+        cryptsetup-util.h
         daemon-util.h
         dev-setup.c
         dev-setup.h

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 753777b6ad8bb7babc74fe8129c5e9549f495bd7..829495175924895602823a88dd8a15fa8bc1da68 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 
 #include "alloc-util.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
 #include "log.h"