summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-id128
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsystemd/sd-id128')
l---------src/libsystemd/sd-id128/Makefile1
-rw-r--r--src/libsystemd/sd-id128/id128-util.c207
-rw-r--r--src/libsystemd/sd-id128/id128-util.h51
-rw-r--r--src/libsystemd/sd-id128/sd-id128.c183
4 files changed, 0 insertions, 442 deletions
diff --git a/src/libsystemd/sd-id128/Makefile b/src/libsystemd/sd-id128/Makefile
deleted file mode 120000
index 94aaae2c4d..0000000000
--- a/src/libsystemd/sd-id128/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../../Makefile \ No newline at end of file
diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c
deleted file mode 100644
index 337eae24b4..0000000000
--- a/src/libsystemd/sd-id128/id128-util.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2016 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "id128-util.h"
-#include "io-util.h"
-#include "stdio-util.h"
-
-char *id128_to_uuid_string(sd_id128_t id, char s[37]) {
- unsigned n, k = 0;
-
- assert(s);
-
- /* Similar to sd_id128_to_string() but formats the result as UUID instead of plain hex chars */
-
- for (n = 0; n < 16; n++) {
-
- if (IN_SET(n, 4, 6, 8, 10))
- s[k++] = '-';
-
- s[k++] = hexchar(id.bytes[n] >> 4);
- s[k++] = hexchar(id.bytes[n] & 0xF);
- }
-
- assert(k == 36);
-
- s[k] = 0;
-
- return s;
-}
-
-bool id128_is_valid(const char *s) {
- size_t i, l;
-
- assert(s);
-
- l = strlen(s);
- if (l == 32) {
-
- /* Plain formatted 128bit hex string */
-
- for (i = 0; i < l; i++) {
- char c = s[i];
-
- if (!(c >= '0' && c <= '9') &&
- !(c >= 'a' && c <= 'z') &&
- !(c >= 'A' && c <= 'Z'))
- return false;
- }
-
- } else if (l == 36) {
-
- /* Formatted UUID */
-
- for (i = 0; i < l; i++) {
- char c = s[i];
-
- if ((i == 8 || i == 13 || i == 18 || i == 23)) {
- if (c != '-')
- return false;
- } else {
- if (!(c >= '0' && c <= '9') &&
- !(c >= 'a' && c <= 'z') &&
- !(c >= 'A' && c <= 'Z'))
- return false;
- }
- }
-
- } else
- return false;
-
- return true;
-}
-
-int id128_read_fd(int fd, Id128Format f, sd_id128_t *ret) {
- char buffer[36 + 2];
- ssize_t l;
-
- assert(fd >= 0);
- assert(f < _ID128_FORMAT_MAX);
-
- /* Reads an 128bit ID from a file, which may either be in plain format (32 hex digits), or in UUID format, both
- * optionally followed by a newline and nothing else. ID files should really be newline terminated, but if they
- * aren't that's OK too, following the rule of "Be conservative in what you send, be liberal in what you
- * accept". */
-
- l = loop_read(fd, buffer, sizeof(buffer), false); /* we expect a short read of either 32/33 or 36/37 chars */
- if (l < 0)
- return (int) l;
- if (l == 0) /* empty? */
- return -ENOMEDIUM;
-
- switch (l) {
-
- case 33: /* plain UUID with trailing newline */
- if (buffer[32] != '\n')
- return -EINVAL;
-
- /* fall through */
- case 32: /* plain UUID without trailing newline */
- if (f == ID128_UUID)
- return -EINVAL;
-
- buffer[32] = 0;
- break;
-
- case 37: /* RFC UUID with trailing newline */
- if (buffer[36] != '\n')
- return -EINVAL;
-
- /* fall through */
- case 36: /* RFC UUID without trailing newline */
- if (f == ID128_PLAIN)
- return -EINVAL;
-
- buffer[36] = 0;
- break;
-
- default:
- return -EINVAL;
- }
-
- return sd_id128_from_string(buffer, ret);
-}
-
-int id128_read(const char *p, Id128Format f, sd_id128_t *ret) {
- _cleanup_close_ int fd = -1;
-
- fd = open(p, O_RDONLY|O_CLOEXEC|O_NOCTTY);
- if (fd < 0)
- return -errno;
-
- return id128_read_fd(fd, f, ret);
-}
-
-int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync) {
- char buffer[36 + 2];
- size_t sz;
- int r;
-
- assert(fd >= 0);
- assert(f < _ID128_FORMAT_MAX);
-
- if (f != ID128_UUID) {
- sd_id128_to_string(id, buffer);
- buffer[32] = '\n';
- sz = 33;
- } else {
- id128_to_uuid_string(id, buffer);
- buffer[36] = '\n';
- sz = 37;
- }
-
- r = loop_write(fd, buffer, sz, false);
- if (r < 0)
- return r;
-
- if (do_sync) {
- if (fsync(fd) < 0)
- return -errno;
- }
-
- return r;
-}
-
-int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync) {
- _cleanup_close_ int fd = -1;
-
- fd = open(p, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0444);
- if (fd < 0)
- return -errno;
-
- return id128_write_fd(fd, f, id, do_sync);
-}
-
-void id128_hash_func(const void *p, struct siphash *state) {
- siphash24_compress(p, 16, state);
-}
-
-int id128_compare_func(const void *a, const void *b) {
- return memcmp(a, b, 16);
-}
-
-const struct hash_ops id128_hash_ops = {
- .hash = id128_hash_func,
- .compare = id128_compare_func,
-};
diff --git a/src/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h
deleted file mode 100644
index 6b3855acbb..0000000000
--- a/src/libsystemd/sd-id128/id128-util.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-/***
- This file is part of systemd.
-
- Copyright 2016 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdbool.h>
-
-#include "sd-id128.h"
-
-#include "hash-funcs.h"
-#include "macro.h"
-
-char *id128_to_uuid_string(sd_id128_t id, char s[37]);
-
-/* Like SD_ID128_FORMAT_STR, but formats as UUID, not in plain format */
-#define ID128_UUID_FORMAT_STR "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
-
-bool id128_is_valid(const char *s) _pure_;
-
-typedef enum Id128Format {
- ID128_ANY,
- ID128_PLAIN, /* formatted as 32 hex chars as-is */
- ID128_UUID, /* formatted as 36 character uuid string */
- _ID128_FORMAT_MAX,
-} Id128Format;
-
-int id128_read_fd(int fd, Id128Format f, sd_id128_t *ret);
-int id128_read(const char *p, Id128Format f, sd_id128_t *ret);
-
-int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync);
-int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync);
-
-void id128_hash_func(const void *p, struct siphash *state);
-int id128_compare_func(const void *a, const void *b) _pure_;
-extern const struct hash_ops id128_hash_ops;
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
deleted file mode 100644
index d4450c70a0..0000000000
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "sd-id128.h"
-
-#include "fd-util.h"
-#include "hexdecoct.h"
-#include "id128-util.h"
-#include "io-util.h"
-#include "macro.h"
-#include "random-util.h"
-#include "util.h"
-
-_public_ char *sd_id128_to_string(sd_id128_t id, char s[SD_ID128_STRING_MAX]) {
- unsigned n;
-
- assert_return(s, NULL);
-
- for (n = 0; n < 16; n++) {
- s[n*2] = hexchar(id.bytes[n] >> 4);
- s[n*2+1] = hexchar(id.bytes[n] & 0xF);
- }
-
- s[32] = 0;
-
- return s;
-}
-
-_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) {
- unsigned n, i;
- sd_id128_t t;
- bool is_guid = false;
-
- assert_return(s, -EINVAL);
-
- for (n = 0, i = 0; n < 16;) {
- int a, b;
-
- if (s[i] == '-') {
- /* Is this a GUID? Then be nice, and skip over
- * the dashes */
-
- if (i == 8)
- is_guid = true;
- else if (i == 13 || i == 18 || i == 23) {
- if (!is_guid)
- return -EINVAL;
- } else
- return -EINVAL;
-
- i++;
- continue;
- }
-
- a = unhexchar(s[i++]);
- if (a < 0)
- return -EINVAL;
-
- b = unhexchar(s[i++]);
- if (b < 0)
- return -EINVAL;
-
- t.bytes[n++] = (a << 4) | b;
- }
-
- if (i != (is_guid ? 36 : 32))
- return -EINVAL;
-
- if (s[i] != 0)
- return -EINVAL;
-
- if (ret)
- *ret = t;
- return 0;
-}
-
-_public_ int sd_id128_get_machine(sd_id128_t *ret) {
- static thread_local sd_id128_t saved_machine_id = {};
- int r;
-
- assert_return(ret, -EINVAL);
-
- if (sd_id128_is_null(saved_machine_id)) {
- r = id128_read("/etc/machine-id", ID128_PLAIN, &saved_machine_id);
- if (r < 0)
- return r;
-
- if (sd_id128_is_null(saved_machine_id))
- return -EINVAL;
- }
-
- *ret = saved_machine_id;
- return 0;
-}
-
-_public_ int sd_id128_get_boot(sd_id128_t *ret) {
- static thread_local sd_id128_t saved_boot_id = {};
- int r;
-
- assert_return(ret, -EINVAL);
-
- if (sd_id128_is_null(saved_boot_id)) {
- r = id128_read("/proc/sys/kernel/random/boot_id", ID128_UUID, &saved_boot_id);
- if (r < 0)
- return r;
- }
-
- *ret = saved_boot_id;
- return 0;
-}
-
-_public_ int sd_id128_get_invocation(sd_id128_t *ret) {
- static thread_local sd_id128_t saved_invocation_id = {};
- int r;
-
- assert_return(ret, -EINVAL);
-
- if (sd_id128_is_null(saved_invocation_id)) {
- const char *e;
-
- e = secure_getenv("INVOCATION_ID");
- if (!e)
- return -ENXIO;
-
- r = sd_id128_from_string(e, &saved_invocation_id);
- if (r < 0)
- return r;
- }
-
- *ret = saved_invocation_id;
- return 0;
-}
-
-static sd_id128_t make_v4_uuid(sd_id128_t id) {
- /* Stolen from generate_random_uuid() of drivers/char/random.c
- * in the kernel sources */
-
- /* Set UUID version to 4 --- truly random generation */
- id.bytes[6] = (id.bytes[6] & 0x0F) | 0x40;
-
- /* Set the UUID variant to DCE */
- id.bytes[8] = (id.bytes[8] & 0x3F) | 0x80;
-
- return id;
-}
-
-_public_ int sd_id128_randomize(sd_id128_t *ret) {
- sd_id128_t t;
- int r;
-
- assert_return(ret, -EINVAL);
-
- r = dev_urandom(&t, sizeof(t));
- if (r < 0)
- return r;
-
- /* Turn this into a valid v4 UUID, to be nice. Note that we
- * only guarantee this for newly generated UUIDs, not for
- * pre-existing ones. */
-
- *ret = make_v4_uuid(t);
- return 0;
-}