mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

util/uuid: replace with util/token, remove libuuid

Browse source 
Use 128-bit hexadecimal string tokens generated with /dev/urandom
instead of UUIDs for xdg-foreign handles, removing the libuuid
dependency. Update readme and CI. Closes #2830.

build: remove xdg-foreign feature

With no external dependencies required, there's no reason not to always
build it. Remove WLR_HAS_XDG_FOREIGN as well.
This commit is contained in:
Ryan Farley 2021-04-07 13:10:43 -05:00 • committed by Simon Ser
parent 5a178c4a23
commit b29ac8fbac
14 changed files with 44 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/meson.build
View file

@ -6,11 +6,6 @@ wlr_files += files(
'shm.c',
'signal.c',
'time.c',
'token.c',
)
if features.get('xdg-foreign')
add_project_arguments('-DHAS_LIBUUID=@0@'.format(uuid.found().to_int()), language: 'c')
wlr_deps += uuid
wlr_files += files('uuid.c')
endif

29
util/token.c Normal file
View file

@ -0,0 +1,29 @@
#include "util/token.h"
#include "wlr/util/log.h"
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
bool generate_token(char out[static TOKEN_STRLEN]) {
static FILE *urandom = NULL;
uint64_t data[2];
if (!urandom) {
if (!(urandom = fopen("/dev/urandom", "r"))) {
wlr_log_errno(WLR_ERROR, "Failed to open random device");
return false;
}
}
if (fread(data, sizeof(data), 1, urandom) != 1) {
wlr_log_errno(WLR_ERROR, "Failed to read from random device");
return false;
}
if (snprintf(out, TOKEN_STRLEN, "%016" PRIx64 "%016" PRIx64, data[0], data[1]) != TOKEN_STRLEN - 1) {
wlr_log_errno(WLR_ERROR, "Failed to format hex string token");
return false;
}
return true;
}

34
util/uuid.c
View file

@ -1,34 +0,0 @@
#include <uuid.h>
#include "util/uuid.h"
#if HAS_LIBUUID
bool generate_uuid(char out[static 37]) {
uuid_t uuid;
uuid_generate_random(uuid);
uuid_unparse(uuid, out);
return true;
}
#else
#include <assert.h>
#include <string.h>
#include <stdlib.h>
bool generate_uuid(char out[static 37]) {
uuid_t uuid;
uint32_t status;
uuid_create(&uuid, &status);
if (status != uuid_s_ok) {
return false;
}
char *str;
uuid_to_string(&uuid, &str, &status);
if (status != uuid_s_ok) {
return false;
}
assert(strlen(str) + 1 == 37);
memcpy(out, str, 37);
free(str);
return true;
}
#endif