[SCM] GNU gnutls branch, master, updated. gnutls_3_0_3-4-g1c31560

[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=1c315602306afc2347984de769873176a97d9db9

The branch, master has been updated
       via  1c315602306afc2347984de769873176a97d9db9 (commit)
       via  cd0c4c57e7326a36402da2ba05e749eff0c1b534 (commit)
       via  521230b3fb19090d66ddd43700ce9d7ee2b496e9 (commit)
      from  04e7684573b1fa947ae8926709b859ed9cc5f285 (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 1c315602306afc2347984de769873176a97d9db9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Sep 20 19:01:57 2011 +0200

    do not trust getaddrinfo if IPv6 is not enabled. Patch by Somchai Smythe.

commit cd0c4c57e7326a36402da2ba05e749eff0c1b534
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Sep 20 18:59:12 2011 +0200

    Added missing files

commit 521230b3fb19090d66ddd43700ce9d7ee2b496e9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Sep 20 18:56:59 2011 +0200

    Compilation fixes when pkcs11 is not enabled.

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

Summary of changes:
 .gitignore                              |    3 +++
 configure.ac                            |    3 ++-
 doc/scripts/{split.pl => split-texi.pl} |    7 +++----
 lib/gnutls_privkey.c                    |    2 ++
 lib/pkcs11.c                            |    2 ++
 src/cli.c                               |    2 ++
 src/serv.c                              |    4 ++++
 7 files changed, 18 insertions(+), 5 deletions(-)
 copy doc/scripts/{split.pl => split-texi.pl} (84%)

diff --git a/.gitignore b/.gitignore
index 4c10f3b..53b2c2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -514,3 +514,6 @@ doc/latex/gnutls-enums.tex
 doc/latex/enums
 doc/latex/gnutls.lof
 doc/latex/gnutls.lot
+tests/x509cert-tl
+doc/enums.texi
+doc/enums/
diff --git a/configure.ac b/configure.ac
index ac644e2..a2a99a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,6 @@ dnl Check for p11-kit
 AC_ARG_WITH(p11-kit,
        AS_HELP_STRING([--without-p11-kit],
                [Build without p11-kit and PKCS#11 support]))
-AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 if test "$with_p11_kit" != "no"; then
        PKG_CHECK_MODULES(P11_KIT, [p11-kit-1 >= 0.4], [with_p11_kit=yes], 
[with_p11_kit=no])
        if test "$with_p11_kit" != "no";then
@@ -144,6 +143,8 @@ if test "$with_p11_kit" != "no"; then
        fi
 fi
 
+AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
+
 dnl Check for libcfg+
 SAVED_LIBS=$LIBS
 AC_ARG_WITH(included-libcfg,
diff --git a/doc/scripts/split.pl b/doc/scripts/split-texi.pl
similarity index 84%
copy from doc/scripts/split.pl
copy to doc/scripts/split-texi.pl
index ed71634..bd6e11e 100755
--- a/doc/scripts/split.pl
+++ b/doc/scripts/split-texi.pl
@@ -19,7 +19,7 @@ sub key_of_record {
   my ($key) = $lines[$i]; 
 
   if ($enum == 1) {
-    while( !($key =~ m/^$\\enumTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key = 
$lines[$i]; }
+    while( !($key =~ m/address@hidden Table,(.*)$/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
   } else {
     while( !($key =~ m/^$\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; 
$key = $lines[$i]; }
   }
@@ -28,7 +28,7 @@ sub key_of_record {
 }
 
 if ($enum == 1) {
-  $/="\n\\end{enum}";          # Records are separated by blank lines.
+  $/="address@hidden float";          # Records are separated by blank lines.
 } else {
   $/="\n\\end{function}";          # Records are separated by blank lines.
 }
@@ -40,14 +40,13 @@ mkdir $dir;
 foreach (@records) {
   $key = $_;
   if ($enum == 1) {
-    $key =~ m/\\enumTitle\{(.*)\}/;
+    $key =~ m/address@hidden Table,(.*)/;
     $key = $1;
   } else {
     $key =~ m/\\functionTitle\{(.*)\}/;
     $key = $1;
   }
 
-  $key =~ s/\\_/_/g;
   if (defined $key && $key ne "") {
     open FILE, "> $dir/$key\n" or die $!;
     print FILE $_ . "\n";
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index b8a3ee0..87ed1c1 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -295,6 +295,8 @@ gnutls_privkey_deinit (gnutls_privkey_t key)
       case GNUTLS_PRIVKEY_X509:
         gnutls_x509_privkey_deinit (key->key.x509);
         break;
+      default:
+        break;
       }
   gnutls_free (key);
 }
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 89bda0c..4f4c071 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <gnutls_errors.h>
 #include <gnutls_datum.h>
+
+
 #include <pkcs11_int.h>
 #include <p11-kit/p11-kit.h>
 #include <p11-kit/pin.h>
diff --git a/src/cli.c b/src/cli.c
index 74912a5..ae665c2 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -169,7 +169,9 @@ load_keys (void)
   int ret, i;
   gnutls_datum_t data = { NULL, 0 };
   gnutls_x509_crt_t crt_list[MAX_CRT];
+#ifdef ENABLE_PKCS11
   gnutls_pkcs11_privkey_t pkcs11_key;
+#endif
   gnutls_x509_privkey_t tmp_key;
   uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
 
diff --git a/src/serv.c b/src/serv.c
index 7736f2e..1fcda5c 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -702,6 +702,10 @@ listen_socket (const char *name, int listen_port, int 
socktype)
 
   for (ptr = res; ptr != NULL; ptr = ptr->ai_next)
     {
+#ifndef HAVE_IPV6
+      if (ptr->ai_family != AF_INET) continue;
+#endif
+
       /* Print what we are doing. */
       {
         char topbuf[512];


hooks/post-receive
-- 
GNU gnutls