[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-4-g0b2d193

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=0b2d193a6b703afa6d2bf8c1b499315ef843f408

The branch, master has been updated
       via  0b2d193a6b703afa6d2bf8c1b499315ef843f408 (commit)
      from  9a9303056eccafbccbdcbf4a67524c5625b4bf47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b2d193a6b703afa6d2bf8c1b499315ef843f408
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 16 19:22:09 2012 +0200

    No need to ask for key password on registered keys.

-----------------------------------------------------------------------

Summary of changes:
 src/tpmtool.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tpmtool.c b/src/tpmtool.c
index b363e17..7af4f63 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, 


hooks/post-receive
-- 
GNU gnutls