diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-08-16 19:22:09 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-08-16 19:22:09 +0200 |
| commit | 0b2d193a6b703afa6d2bf8c1b499315ef843f408 (patch) | |
| tree | ad714df57875f19689f01178505cd4cb865e092d | |
| parent | 9a9303056eccafbccbdcbf4a67524c5625b4bf47 (diff) | |
| download | gnutls-0b2d193a6b703afa6d2bf8c1b499315ef843f408.tar.gz | |
No need to ask for key password on registered keys.
| -rw-r--r-- | src/tpmtool.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tpmtool.c b/src/tpmtool.c index b363e17b29..7af4f63d0e 100644 --- a/src/tpmtool.c +++ b/src/tpmtool.c @@ -190,16 +190,19 @@ cmd_parser (int argc, char **argv) static void tpm_generate(FILE* outfile, unsigned int key_type, unsigned int bits, unsigned int flags) { int ret; - char* srk_pass, *key_pass; + char* srk_pass, *key_pass = NULL; gnutls_datum_t privkey, pubkey; srk_pass = getpass ("Enter SRK password: "); if (srk_pass != NULL) srk_pass = strdup(srk_pass); - key_pass = getpass ("Enter key password: "); - if (key_pass != NULL) - key_pass = strdup(srk_pass); + if (!(flags & GNUTLS_TPM_REGISTER_KEY)) + { + key_pass = getpass ("Enter key password: "); + if (key_pass != NULL) + key_pass = strdup(srk_pass); + } ret = gnutls_tpm_privkey_generate(key_type, bits, srk_pass, key_pass, outkey_format, outcert_format, |