[SCM] GNU gnutls branch, master, updated. gnutls_3_0_9-30-g2f6f33e

[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=2f6f33e6f1a885f0f234974c3bce4ae65d37a86b

The branch, master has been updated
       via  2f6f33e6f1a885f0f234974c3bce4ae65d37a86b (commit)
       via  cb9d7a311b04052dfe89f37adf6e3228051c194a (commit)
       via  4fb516a49eb273e5fa5241cc49d262ee6a038ae9 (commit)
      from  f529cabd38680a5fef482c5eb8c1bb10455fb8d1 (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 2f6f33e6f1a885f0f234974c3bce4ae65d37a86b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 28 21:45:28 2011 +0200

    Add random art to keys.

commit cb9d7a311b04052dfe89f37adf6e3228051c194a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 28 21:35:15 2011 +0200

    Skip deflate test if libz is not available.

commit 4fb516a49eb273e5fa5241cc49d262ee6a038ae9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 28 21:24:17 2011 +0200

    updated random art's messages.

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

Summary of changes:
 lib/openpgp/output.c               |    2 +-
 lib/x509/output.c                  |    2 +-
 src/certtool.c                     |    6 +++---
 tests/mini-deflate.c               |   33 +++++++++++++++++++++++++++------
 tests/pathlen/ca-no-pathlen.pem    |   15 +++++++++++++--
 tests/pathlen/no-ca-or-pathlen.pem |   15 +++++++++++++--
 6 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index b65aade..7a6e048 100644
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -127,7 +127,7 @@ print_key_fingerprint (gnutls_buffer_st * str, 
gnutls_openpgp_crt_t cert)
   if (p == NULL)
     return;
   
-  adds (str, _("\tpublic key's randomart:\n"));
+  adds (str, _("\tFingerprint's random art:\n"));
   adds (str, p);
   adds (str, "\n\n");
 
diff --git a/lib/x509/output.c b/lib/x509/output.c
index 2ecbff2..9f1996b 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1398,7 +1398,7 @@ print_keyid (gnutls_buffer_st * str, gnutls_x509_crt_t 
cert)
   if (p == NULL)
     return;
   
-  adds (str, _("\tpublic key's randomart:\n"));
+  adds (str, _("\tPublic key's random art:\n"));
   adds (str, p);
   adds (str, "\n\n");
 
diff --git a/src/certtool.c b/src/certtool.c
index 3def624..de580fd 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1391,12 +1391,12 @@ pgp_privkey_info (void)
         {
           gnutls_datum_t art;
 
-          fprintf (outfile, "Public Key ID: %s\n", raw_to_string (keyid, 8));
+          fprintf (outfile, "Fingerprint: %s\n", raw_to_string (keyid, 8));
 
           ret = gnutls_random_art(GNUTLS_RANDOM_ART_OPENSSH, cprint, bits, 
keyid, 8, &art);
           if (ret >= 0)
             {
-              fprintf (outfile, "public key's randomart:\n%s\n\n", art.data);
+              fprintf (outfile, "Fingerprint's random art:\n%s\n\n", art.data);
               gnutls_free(art.data);
             }
         }
@@ -1730,7 +1730,7 @@ const char *cprint;
       ret = gnutls_random_art(GNUTLS_RANDOM_ART_OPENSSH, cprint, bits, buffer, 
size, &art);
       if (ret >= 0)
         {
-          fprintf (outfile, "public key's randomart:\n%s\n", art.data);
+          fprintf (outfile, "Public key's random art:\n%s\n", art.data);
           gnutls_free(art.data);
         }
     }
diff --git a/tests/mini-deflate.c b/tests/mini-deflate.c
index 4edd4db..6364e1e 100644
--- a/tests/mini-deflate.c
+++ b/tests/mini-deflate.c
@@ -29,9 +29,11 @@
 #include <string.h>
 #include <errno.h>
 #include <gnutls/gnutls.h>
-#include "eagain-common.h"
 
-#include "utils.h"
+#ifdef HAVE_LIBZ
+
+# include "eagain-common.h"
+# include "utils.h"
 
 static void
 tls_log_func (int level, const char *str)
@@ -39,8 +41,8 @@ tls_log_func (int level, const char *str)
   fprintf (stderr, "|<%d>| %s", level, str);
 }
 
-#define MAX_BUF 6*1024
-#define MSG "Hello TLS, and Hello and Hello and Hello"
+# define MAX_BUF 6*1024
+# define MSG "Hello TLS, and Hello and Hello and Hello"
 
 void
 doit (void)
@@ -59,6 +61,7 @@ doit (void)
   char buffer[MAX_BUF + 1];
   ssize_t ns;
   int ret, transferred = 0, msglen;
+  const char * str;
 
   /* General init. */
   gnutls_global_init ();
@@ -72,7 +75,13 @@ doit (void)
   gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
   gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
   gnutls_init (&server, GNUTLS_SERVER);
-  gnutls_priority_set_direct (server, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-DEFLATE:+ANON-DH", 
NULL);
+  ret = gnutls_priority_set_direct (server, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-DEFLATE:+ANON-DH", 
&str);
+  if (ret < 0) 
+    {
+      fprintf(stderr, "error at: %s\n", str);
+      exit(1);
+    }
+  
   gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
@@ -82,7 +91,12 @@ doit (void)
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
   gnutls_init (&client, GNUTLS_CLIENT);
-  gnutls_priority_set_direct (client, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-DEFLATE:+ANON-DH", 
NULL);
+  ret = gnutls_priority_set_direct (client, 
"NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-DEFLATE:+ANON-DH", 
&str);
+  if (ret < 0) 
+    {
+      fprintf(stderr, "error at: %s\n", str);
+      exit(1);
+    }
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
@@ -111,3 +125,10 @@ doit (void)
 
   gnutls_global_deinit ();
 }
+#else
+
+int main(int argc, char** argv)
+{
+  return 77;
+}
+#endif
diff --git a/tests/pathlen/ca-no-pathlen.pem b/tests/pathlen/ca-no-pathlen.pem
index bbc0494..44f70a1 100644
--- a/tests/pathlen/ca-no-pathlen.pem
+++ b/tests/pathlen/ca-no-pathlen.pem
@@ -28,12 +28,23 @@ X.509 Certificate Information:
                f3:6e:7e:4c:f3:8d:ed:2a:f8:3f:39:04:ef:a4:fd:e3
                fc:cb:ba:1f:2a:1d:ad:f3:f9:68:39:f4:6d:1f:6a:15
 Other Information:
-       MD5 fingerprint:
-               5cce3c6f6ec69c724f33155a06de7322
        SHA-1 fingerprint:
                f3ddd5478b80b142200b50c9eb2ee37061b09ed6
        Public Key Id:
                f268df0e814c0302ed338e146f57421dba44f06c
+       Public key's random art:
++--[ RSA  512]----+
+|.o..+o...        |
+| ...+o.o         |
+| .o  E=          |
+| .+oo+.o         |
+|.o.o..+ S        |
+|. .    + .       |
+|      o o        |
+|     . . o       |
+|        ..o      |
++-----------------+
+
 
 -----BEGIN CERTIFICATE-----
 MIIBYDCCAQygAwIBAgIBADALBgkqhkiG9w0BAQUwIjEgMB4GA1UEChMXR251VExT
diff --git a/tests/pathlen/no-ca-or-pathlen.pem 
b/tests/pathlen/no-ca-or-pathlen.pem
index 9581eb2..9545a70 100644
--- a/tests/pathlen/no-ca-or-pathlen.pem
+++ b/tests/pathlen/no-ca-or-pathlen.pem
@@ -46,12 +46,23 @@ warning: signed using a broken signature algorithm that can 
be forged.
                59:0c:44:ca:ce:ad:77:24:52:b4:78:5f:cc:4f:15:a7
                8f:20:81:56:65:08:50:37:75:bc:a2:11:82:72:48:76
 Other Information:
-       MD5 fingerprint:
-               7c0ac198038b55033b4ea8b14cccc540
        SHA-1 fingerprint:
                8f735c5ddefd723f59b6a3bb2ac0522470c0182f
        Public Key Id:
                1e09d707d4e3651b84dcb6c68a828d2affef7ec3
+       Public key's random art:
++--[ RSA 1024]----+
+|         .oo +.  |
+|         . .= *  |
+|      . . ...* + |
+|       o . .. =  |
+|       +S  . o   |
+|      o.o.. .    |
+|     .  .o       |
+|  . .     E      |
+|   o...++. .     |
++-----------------+
+
 
 -----BEGIN CERTIFICATE-----
 MIIEhDCCA+2gAwIBAgIQLhA3A99GhZ16VQ2mWWGFODANBgkqhkiG9w0BAQQFADCB


hooks/post-receive
-- 
GNU gnutls