system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

creds: allow null when decrypting

Browse source 
pcrlock writes a credential file using null key. Make sure systemd-creds
can show the file
This commit is contained in:
Ludwig Nussel 2024-04-04 17:05:18 +02:00 committed by Luca Boccassi
parent eff0a82534
commit aadbe55925
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
man/systemd-creds.xml
View file

@ -433,6 +433,14 @@
<xi:include href="version-info.xml" xpointer="v252"/></listitem>
</varlistentry>
<varlistentry>
<term><option>--allow-null</option></term>
<listitem><para>Allow decrypting credentials that use an empty key.</para>
<xi:include href="version-info.xml" xpointer="v256"/></listitem>
</varlistentry>
<varlistentry>
<term><option>--quiet</option></term>
<term><option>-q</option></term>

10
src/creds/creds.c
View file

@ -60,6 +60,7 @@ static bool arg_pretty = false;
static bool arg_quiet = false;
static bool arg_varlink = false;
static uid_t arg_uid = UID_INVALID;
static bool arg_allow_null = false;
STATIC_DESTRUCTOR_REGISTER(arg_tpm2_public_key, freep);
STATIC_DESTRUCTOR_REGISTER(arg_tpm2_signature, freep);
@ -623,7 +624,7 @@ static int verb_decrypt(int argc, char **argv, void *userdata) {
arg_tpm2_signature,
arg_uid,
&input,
/* flags= */ 0,
arg_allow_null ? CREDENTIAL_ALLOW_NULL : 0,
&plaintext);
if (r < 0)
return r;
@ -741,6 +742,7 @@ static int verb_help(int argc, char **argv, void *userdata) {
" Specify signature for public key PCR policy\n"
" --user Select user-scoped credential encryption\n"
" --uid=UID Select user for scoped credentials\n"
" --allow-null Allow decrypting credentials with empty key\n"
" -q --quiet Suppress output for 'has-tpm2' verb\n"
"\nSee the %2$s for details.\n",
program_invocation_short_name,
@ -774,6 +776,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_NOT_AFTER,
ARG_USER,
ARG_UID,
ARG_ALLOW_NULL,
};
static const struct option options[] = {
@ -798,6 +801,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "quiet", no_argument, NULL, 'q' },
{ "user", no_argument, NULL, ARG_USER },
{ "uid", required_argument, NULL, ARG_UID },
{ "allow-null", no_argument, NULL, ARG_ALLOW_NULL },
{}
};
@ -985,6 +989,10 @@ static int parse_argv(int argc, char *argv[]) {
}
break;
case ARG_ALLOW_NULL:
arg_allow_null = true;
break;
case 'q':
arg_quiet = true;
break;