[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-133-ga649e5c

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

The branch, master has been updated
       via  a649e5caa8eeacef0369a788f10fbf71649639dd (commit)
       via  6a04c558760e529fc6eff48d061ce8ccdede5ed5 (commit)
      from  fd5ca1afb7b223f1ce0c5330f2611996491c6aae (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 a649e5caa8eeacef0369a788f10fbf71649639dd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 7 22:13:32 2012 +0200

    Print the fingerprint only in the first certificate in the chain.

commit 6a04c558760e529fc6eff48d061ce8ccdede5ed5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 7 22:05:56 2012 +0200

    GNUTLS_E_ENCRYPTED_STRUCTURE is no more.

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

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

diff --git a/src/certtool.c b/src/certtool.c
index 1b48dc2..d0bfba1 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1784,7 +1784,7 @@ privkey_info (common_info_st* cinfo)
     {
       ret = gnutls_x509_privkey_import_pkcs8 (key, &pem,
                                               incert_format, NULL, 
GNUTLS_PKCS8_PLAIN);
-      if (ret == GNUTLS_E_ENCRYPTED_STRUCTURE)
+      if (ret == GNUTLS_E_DECRYPTION_FAILED)
         {
           fprintf(stderr, "Encrypted structure detected...\n");
           if (cinfo->password)
diff --git a/src/common.c b/src/common.c
index c2f30a0..95de4b4 100644
--- a/src/common.c
+++ b/src/common.c
@@ -139,6 +139,7 @@ print_x509_info (gnutls_session_t session, int flag, int 
print_cert)
             }
 
           printf ("- Certificate[%d] info:\n - ", j);
+          if (flag == GNUTLS_CRT_PRINT_COMPACT && j > 0) flag = 
GNUTLS_CRT_PRINT_ONELINE;
 
           ret =
             gnutls_x509_crt_print (crt, flag, &cinfo);


hooks/post-receive
-- 
GNU gnutls