Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-08-11 12:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

swtpm: Remove broken logic to check for neither dir nor file backend

Browse Source 
Remove the broken logic to check for neither dir:// nor file:// backend.
If an unknow backend type is used, then it will be detected later on
and an error message will be printed out. Even though the logic was
broken it didn't seem to cause failures.

Also have tpmstate_set_mode return void since it cannot fail.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2024-10-14 14:50:21 -04:00 committed by Stefan Berger
parent eb5875793e
commit 4be72bc65a
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/swtpm/common.c
View File

@ -753,8 +753,7 @@ handle_tpmstate_options(const char *options)
goto error;
}
if (tpmstate_set_backend_uri(temp_uri) < 0 ||
tpmstate_set_mode(mode, mode_is_default) < 0) {
if (tpmstate_set_backend_uri(temp_uri) < 0) {
ret = -1;
goto error;
}
@ -763,14 +762,10 @@ handle_tpmstate_options(const char *options)
ret = -1;
goto error;
}
if ((strncmp(tpmbackend_uri, "dir://", 6) == 0 ||
strncmp(tpmbackend_uri, "file://", 7)) &&
tpmstate_set_mode(mode, mode_is_default) < 0) {
ret = -1;
goto error;
}
}
tpmstate_set_mode(mode, mode_is_default);
error:
free(tpmstatedir);
free(tpmbackend_uri);

4
src/swtpm/tpmstate.c
View File

@ -88,12 +88,10 @@ const char *tpmstate_get_backend_uri(void)
return NULL;
}
int tpmstate_set_mode(mode_t mode, bool mode_is_default)
void tpmstate_set_mode(mode_t mode, bool mode_is_default)
{
g_tpmstate_mode = mode;
g_tpmstate_mode_is_default = mode_is_default;
return 0;
}
mode_t tpmstate_get_mode(bool *mode_is_default)

2
src/swtpm/tpmstate.h
View File

@ -45,7 +45,7 @@
int tpmstate_set_backend_uri(char *backend_uri);
const char *tpmstate_get_backend_uri(void);
int tpmstate_set_mode(mode_t mode, bool mode_is_default);
void tpmstate_set_mode(mode_t mode, bool mode_is_default);
mode_t tpmstate_get_mode(bool *mode_is_default);
void tpmstate_global_free(void);