[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-139-gad350db

[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=ad350dbd623bf31f34f9c18e04ca04aae8e456cd

The branch, gnutls_2_12_x has been updated
       via  ad350dbd623bf31f34f9c18e04ca04aae8e456cd (commit)
       via  a69b26a4b3f4fb8fdef5adefcc79eeb146c68701 (commit)
      from  5236ebd5c994dcdee8c514ff032c57c978ceec25 (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 ad350dbd623bf31f34f9c18e04ca04aae8e456cd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 2 18:45:30 2011 +0100

    Allow providing no password for PKCS #12 structure generation. Reported by 
Daniel Kahn Gillmor.

commit a69b26a4b3f4fb8fdef5adefcc79eeb146c68701
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 2 18:42:48 2011 +0100

    consistently print all interactive questions to stderr. Reported by Daniel 
Kahn Gillmor.

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

Summary of changes:
 src/certtool-cfg.c |    2 +-
 src/certtool.c     |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 7203816..5811498 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -251,7 +251,7 @@ read_int_with_default (const char *input_str, int def)
   char *endptr;
   long l;
 
-  printf (input_str, def);
+  fprintf (stderr, input_str, def);
   in = readline ("");
   if (in == NULL)
     {
diff --git a/src/certtool.c b/src/certtool.c
index c99ccf0..b312fca 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -2436,6 +2436,13 @@ generate_pkcs12 (common_info_st * cinfo)
     pass = info.pass;
   else
     pass = get_pass ();
+    
+  if (pass == NULL)
+    {
+      fprintf(stderr, "No password given for PKCS #12. Assuming null 
password...\n");
+      pass = "";
+    }
+    
 
   for (i = 0; i < ncrts; i++)
     {


hooks/post-receive
-- 
GNU gnutls