diff options
| author | Werner Koch <[email protected]> | 2018-03-09 09:36:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-09 09:36:14 +0000 |
| commit | fb0470a9f5834b77fba2bf5e1b41f56d063e556f (patch) | |
| tree | ca3719d0bb5143d36cfa7146330a6b0e531fd623 /agent/command.c | |
| parent | tpm2: add handling for elliptic curve keys (diff) | |
| download | gnupg-fb0470a9f5834b77fba2bf5e1b41f56d063e556f.tar.gz gnupg-fb0470a9f5834b77fba2bf5e1b41f56d063e556f.zip | |
agent: Minor cleanup of the TPM patches.
* configure.ac (AC_CHECK_HEADERS): Add tss2/tss.h.
* agent/divert-tpm2.c: Print an error if that file is not available.
* agent/Makefile.am (gpg_agent_SOURCES): Add tpm.h
* agent/command.c (do_one_keyinfo): Replace xstrdup by xtrystrdup.
* agent/protect.c (agent_get_shadow_info_type): Check error of
xtrystrdup.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/command.c')
| -rw-r--r-- | agent/command.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/agent/command.c b/agent/command.c index c439aa5f7..a46e2888e 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1104,7 +1104,8 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx, char hexgrip[40+1]; char *fpr = NULL; int keytype; - unsigned char *shadow_info = NULL, *shadow_info_type = NULL; + unsigned char *shadow_info = NULL; + unsigned char *shadow_info_type = NULL; char *serialno = NULL; char *idstr = NULL; const char *keytypestr; @@ -1194,7 +1195,12 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx, } else if (strcmp (shadow_info_type, "tpm2-v1") == 0) { - serialno = xstrdup("TPM-Protected"); + serialno = xtrystrdup("TPM-Protected"); + if (!serialno) + { + err = gpg_error_from_syserror (); + goto leave; + } idstr = NULL; } else |