shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 06:25:37 +03:00
Code

cryptsetup-util: introduce crypt_free_and_replace()

Browse Source
This commit is contained in:
Yu Watanabe 2022-09-17 03:24:26 +09:00
parent 0ea720ca7e
commit cf610e1d87
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shared/cryptsetup-util.h
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "alloc-util.h"
#include "json.h"
#include "macro.h"
@ -69,6 +70,10 @@ int dlopen_cryptsetup(void);
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
/* Be careful, this works with dlopen_cryptsetup(), that is, it calls sym_crypt_free() instead of crypt_free(). */
#define crypt_free_and_replace(a, b) \
free_and_replace_full(a, b, sym_crypt_free)
void cryptsetup_enable_logging(struct crypt_device *cd);
int cryptsetup_set_minimal_pbkdf(struct crypt_device *cd);

3
src/shared/dissect-image.c
View File

@ -2016,8 +2016,7 @@ static int verity_partition(
if (r < 0)
return r;
sym_crypt_free(cd);
cd = TAKE_PTR(existing_cd);
crypt_free_and_replace(cd, existing_cd);
}
}
if (r >= 0)