Merge branch 'master' of ssh://nmav@git.sv.gnu.org/srv/git/gnutls

16 files changed, 210 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index cc13785327..a7734244a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,143 @@
+2008-04-21  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Version 2.3.7.
+
+2008-04-21  Simon Josefsson <simon@josefsson.org>
+
+	* doc/Makefile.am: Don't clean Guile documentations on make clean.
+
+2008-04-21  Simon Josefsson <simon@josefsson.org>
+
+	* src/cli.c, src/psk-gaa.c, src/psk.gaa, src/serv.c, src/tests.c: 
+	Fix warnings.
+
+2008-04-21  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Fix.
+
+2008-04-21  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, doc/reference/Makefile.am, lib/minitasn1/Makefile.am,
+	lib/minitasn1/coding.c, lib/minitasn1/decoding.c,
+	lib/minitasn1/element.c, lib/minitasn1/int.h,
+	lib/minitasn1/libtasn1.h, lib/minitasn1/mem.h: Update to libtasn1
+	1.4.
+
+2008-04-19  Nikos Mavrogiannopoulos <nmav@crystal.(none)>
+
+	* NEWS: opencdk now properly sets the key usage bits into openpgp
+	keys.
+
+2008-04-19  Nikos Mavrogiannopoulos <nmav@crystal.(none)>
+
+	* lib/opencdk/keydb.c, lib/opencdk/read-packet.c: save key usage
+	while reading public keys.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, THANKS: Add.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* src/cli.c: Don't crash on TLS handshake failures.  Reported by
+	"Marc F. Clemente" <marc@mclemente.net> in Debian BTS #466477.  This
+	is related to the 5e5f086e124d8d90829fc8e22f34044161da5f80 fix, this
+	part is necessary too.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, src/certtool.c: certtool: with --generate-request and newly
+	generated keys, print the key.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* configure.in: Explain libgcrypt around gnulib.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* doc/reference/Makefile.am, doc/reference/gnutls-docs.sgml: Don't
+	document opencdk API.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Add.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Add.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* configure.in: Typo fix.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* lib/Makefile.am: Link to -lws2_32 if needed.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* configure.in: Define WINVER to get modern features.  Test for
+	ws2_32.  Add conditional.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Add.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* lib/x509/output.c: Use ASCII-only isprint function to get
+	consistent outputs.  Reported by Massimo Gaspari
+	<massimo.gaspari@alice.it> in
+	<http://permalink.gmane.org/gmane.network.gnutls.general/1184>.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* lgl/Makefile.am, lgl/c-ctype.c, lgl/c-ctype.h, lgl/dummy.c,
+	lgl/m4/gnulib-cache.m4, lgl/m4/gnulib-comp.m4: Add c-ctype module,
+	for lib/x509/output.c.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* gl/fseeko.c, gl/gnulib.mk, gl/lseek.c, gl/m4/extensions.m4,
+	gl/m4/fseeko.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4,
+	gl/m4/lseek.m4, gl/m4/netinet_in_h.m4, gl/m4/strerror.m4,
+	lgl/Makefile.am, lgl/fseeko.c, lgl/lseek.c, lgl/m4/extensions.m4,
+	lgl/m4/fseeko.m4, lgl/m4/gnulib-cache.m4, lgl/m4/gnulib-comp.m4,
+	lgl/m4/lseek.m4, lgl/m4/memmem.m4, lgl/m4/stdint.m4,
+	lgl/m4/stdio_h.m4, lgl/m4/sys_socket_h.m4: Move fseeko to lgl/ from
+	gl/ for opencdk.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* configure.in: Link to libgcrypt when running gnulib checks, to get
+	their vasprintf on MinGW.
+
+2008-04-18  Simon Josefsson <simon@josefsson.org>
+
+	* configure.in: Don't check for vasprintf, already checked for by
+	gnulib.
+
+2008-04-17  Nikos Mavrogiannopoulos <nmav@crystal.(none)>
+
+	* lib/openpgp/pgp.c: corrected typo.
+
+2008-04-17  Simon Josefsson <simon@josefsson.org>
+
+	* .clcopying, .cvscopying, .cvsusers, Makefile.am, src/pkcs1.asn: 
+	Fix some obsolete stuff.
+
+2008-04-17  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, configure.in: Bump versions.
+
+2008-04-17  Simon Josefsson <simon@josefsson.org>
+
+	* lib/x509/x509.c: (gnutls_x509_crt_get_key_usage): Doc fix.
+
+2008-04-17  Simon Josefsson <simon@josefsson.org>
+
+	* ChangeLog: Generated.
+
 2008-04-17  Simon Josefsson <simon@josefsson.org>
 
 	* NEWS: Version 2.3.6.
diff --git a/NEWS b/NEWS
index 5e8b1871b8..723b6e330f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2008 Simon Josefsson
 Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavrogiannopoulos
 See the end for copying conditions.
 
-* Version 2.3.7 (unreleased)
+* Version 2.3.7 (released 2008-04-21)
 
 ** opencdk now properly sets the key usage bits into openpgp keys.
 
@@ -17,7 +17,10 @@ This is similar to <http://bugs.debian.org/429183>.
 Missing rpl_fseeko symbol in lib/opencdk/.  Better checks for linking
 with -lws2_32 when needed.  Use ASCII only isprint() when printing
 X.509 certificate information, to avoid non-ASCII but printable
-characters.
+characters.  Thanks to Massimo Gaspari <massimo.gaspari@alice.it> for
+reports.
+
+** Update internal copy of libtasn1 to version 1.4.
 
 ** API and ABI modifications:
 No changes since last version.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 87f098bf44..da61cdacad 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -121,10 +121,10 @@ error_codes.texi: ../lib/gnutls_errors.c ../src/errcodes.c
 	-../src/errcodes > error_codes.texi
 
 
-guile_texi     = core.c.texi extra.c.texi
-BUILT_SOURCES  = $(guile_texi)
-CLEANFILES     = $(guile_texi)
-EXTRA_DIST    += $(guile_texi)
+guile_texi           = core.c.texi extra.c.texi
+BUILT_SOURCES        = $(guile_texi)
+MAINTAINERCLEANFILES = $(guile_texi)
+EXTRA_DIST           += $(guile_texi)
 
 if HAVE_GUILE
 
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index ef10f01895..619612d0f9 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -69,18 +69,18 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h	\
 	auth_psk_passwd.h memmem.h gnutls_helper.h			\
 	ext_inner_application.h						\
 									\
-	der.h errors.h gstr.h parser_aux.h element.h			\
-	errors_int.h int.h mem.h structure.h				\
+	der.h errors.h gstr.h parser_aux.h element.h errors_int.h	\
+	int.h structure.h						\
 									\
 	common.h compat.h						\
 									\
-	openssl_compat.h					\
+	openssl_compat.h						\
 									\
 	cipher.h context.h filters.h main.h md.h packet.h		\
 	stream.h types.h						\
 									\
 	gnutls_openpgp.h gnutlsxx.h gnutls_extra_hooks.h		\
-	gnutls_supplemental.h 						\
+	gnutls_supplemental.h						\
 	opencdk.h
 
 # Images to copy into HTML directory.
diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am
index df8892d6bb..371a1d2555 100644
--- a/lib/minitasn1/Makefile.am
+++ b/lib/minitasn1/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lgl -I$(top_builddir)/lgl
 
 noinst_LTLIBRARIES = libminitasn1.la
 
-libminitasn1_la_SOURCES = libtasn1.h mem.h gstr.h errors.h int.h	\
+libminitasn1_la_SOURCES = libtasn1.h gstr.h errors.h int.h		\
         parser_aux.h structure.h element.h decoding.c gstr.c errors.c	\
         parser_aux.c structure.c element.c coding.c
 
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c
index cd646c7822..74c83904ec 100644
--- a/lib/minitasn1/coding.c
+++ b/lib/minitasn1/coding.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008 Free Software Foundation
  *      Copyright (C) 2002  Fabio Fiorina
  *
  * This file is part of LIBTASN1.
@@ -260,7 +260,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der, int *der_len)
 
   max_len = *der_len;
 
-  temp = (char *) _asn1_alloca (strlen (str) + 2);
+  temp = (char *) _asn1_malloc (strlen (str) + 2);
   if (temp == NULL)
     return ASN1_MEM_ALLOC_ERROR;
 
@@ -312,7 +312,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der, int *der_len)
     }
   *der_len += len_len;
 
-  _asn1_afree (temp);
+  _asn1_free (temp);
 
   if (max_len < (*der_len))
     return ASN1_MEM_ERROR;
@@ -636,7 +636,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, node_asn * node)
   first = last = NULL;
   while (p)
     {
-      p_vet = (struct vet *) _asn1_alloca (sizeof (struct vet));
+      p_vet = (struct vet *) _asn1_malloc (sizeof (struct vet));
       if (p_vet == NULL)
 	return;
 
@@ -677,7 +677,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, node_asn * node)
 	  if (p_vet->value > p2_vet->value)
 	    {
 	      /* change position */
-	      temp = (unsigned char *) _asn1_alloca (p_vet->end - counter);
+	      temp = (unsigned char *) _asn1_malloc (p_vet->end - counter);
 	      if (temp == NULL)
 		return;
 
@@ -686,7 +686,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, node_asn * node)
 		      p2_vet->end - p_vet->end);
 	      memcpy (der + counter + p2_vet->end - p_vet->end, temp,
 		      p_vet->end - counter);
-	      _asn1_afree (temp);
+	      _asn1_free (temp);
 
 	      tag = p_vet->value;
 	      p_vet->value = p2_vet->value;
@@ -704,7 +704,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, node_asn * node)
 	p_vet->prev->next = NULL;
       else
 	first = NULL;
-      _asn1_afree (p_vet);
+      _asn1_free (p_vet);
       p_vet = first;
     }
 }
@@ -750,7 +750,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, node_asn * node)
   first = last = NULL;
   while (p)
     {
-      p_vet = (struct vet *) _asn1_alloca (sizeof (struct vet));
+      p_vet = (struct vet *) _asn1_malloc (sizeof (struct vet));
       if (p_vet == NULL)
 	return;
 
@@ -815,7 +815,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, node_asn * node)
 	  if (change == 1)
 	    {
 	      /* change position */
-	      temp = (unsigned char *) _asn1_alloca (p_vet->end - counter);
+	      temp = (unsigned char *) _asn1_malloc (p_vet->end - counter);
 	      if (temp == NULL)
 		return;
 
@@ -824,7 +824,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, node_asn * node)
 		      (p2_vet->end) - (p_vet->end));
 	      memcpy (der + counter + (p2_vet->end) - (p_vet->end), temp,
 		      (p_vet->end) - counter);
-	      _asn1_afree (temp);
+	      _asn1_free (temp);
 
 	      p_vet->end = counter + (p2_vet->end - p_vet->end);
 	    }
@@ -838,7 +838,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, node_asn * node)
 	p_vet->prev->next = NULL;
       else
 	first = NULL;
-      _asn1_afree (p_vet);
+      _asn1_free (p_vet);
       p_vet = first;
     }
 }
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index 5d51a4e37f..c1de9e6773 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008 Free Software Foundation
  *      Copyright (C) 2002 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
@@ -618,7 +618,7 @@ _asn1_get_octet_string (const unsigned char *der, node_asn * node, int *len)
       if (node)
 	{
 	  asn1_length_der (tot_len, NULL, &len2);
-	  temp = _asn1_alloca (len2 + tot_len);
+	  temp = _asn1_malloc (len2 + tot_len);
 	  if (temp == NULL)
 	    {
 	      return ASN1_MEM_ALLOC_ERROR;
@@ -653,7 +653,7 @@ _asn1_get_octet_string (const unsigned char *der, node_asn * node, int *len)
 	    }
 
 	  _asn1_set_value (node, temp, tot_len);
-	  _asn1_afree (temp);
+	  _asn1_free (temp);
 	}
     }
   else
@@ -1193,7 +1193,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
 		{
 		  len2 += len4;
 		  asn1_length_der (len2 + len3, NULL, &len4);
-		  temp2 = (unsigned char *) _asn1_alloca (len2 + len3 + len4);
+		  temp2 = (unsigned char *) _asn1_malloc (len2 + len3 + len4);
 		  if (temp2 == NULL)
 		    {
 		      asn1_delete_structure (element);
@@ -1202,7 +1202,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
 
 		  asn1_octet_der (der + counter, len2 + len3, temp2, &len4);
 		  _asn1_set_value (p, temp2, len4);
-		  _asn1_afree (temp2);
+		  _asn1_free (temp2);
 		  counter += len2 + len3;
 		}
 	      else
@@ -1222,7 +1222,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
 		      return ris;
 		    }
 		  asn1_length_der (len2, NULL, &len4);
-		  temp2 = (unsigned char *) _asn1_alloca (len2 + len4);
+		  temp2 = (unsigned char *) _asn1_malloc (len2 + len4);
 		  if (temp2 == NULL)
 		    {
 		      asn1_delete_structure (element);
@@ -1231,7 +1231,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
 
 		  asn1_octet_der (der + counter, len2, temp2, &len4);
 		  _asn1_set_value (p, temp2, len4);
-		  _asn1_afree (temp2);
+		  _asn1_free (temp2);
 		  counter += len2;
 
 		  /* Check if a couple of 0x00 are present due to an EXPLICIT TAG with
@@ -1879,7 +1879,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
 		    {
 		      asn1_length_der (len2 + len3, NULL, &len4);
 		      temp2 =
-			(unsigned char *) _asn1_alloca (len2 + len3 + len4);
+			(unsigned char *) _asn1_malloc (len2 + len3 + len4);
 		      if (temp2 == NULL)
 			{
 			  asn1_delete_structure (structure);
@@ -1889,7 +1889,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
 		      asn1_octet_der (der + counter, len2 + len3, temp2,
 				      &len4);
 		      _asn1_set_value (p, temp2, len4);
-		      _asn1_afree (temp2);
+		      _asn1_free (temp2);
 
 		      if (p == nodeFound)
 			state = EXIT;
@@ -1916,7 +1916,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
 		  if (state == FOUND)
 		    {
 		      asn1_length_der (len2, NULL, &len4);
-		      temp2 = (unsigned char *) _asn1_alloca (len2 + len4);
+		      temp2 = (unsigned char *) _asn1_malloc (len2 + len4);
 		      if (temp2 == NULL)
 			{
 			  asn1_delete_structure (structure);
@@ -1925,7 +1925,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
 
 		      asn1_octet_der (der + counter, len2, temp2, &len4);
 		      _asn1_set_value (p, temp2, len4);
-		      _asn1_afree (temp2);
+		      _asn1_free (temp2);
 
 		      if (p == nodeFound)
 			state = EXIT;
diff --git a/lib/minitasn1/element.c b/lib/minitasn1/element.c
index fd66f248aa..752b40da85 100644
--- a/lib/minitasn1/element.c
+++ b/lib/minitasn1/element.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008 Free Software Foundation
  *      Copyright (C) 2000, 2001, 2002, 2003 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
@@ -350,7 +350,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 	  if ((isdigit (value[0])) || (value[0] == '-'))
 	    {
 	      value_temp =
-		(unsigned char *) _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT);
+		(unsigned char *) _asn1_malloc (SIZEOF_UNSIGNED_LONG_INT);
 	      if (value_temp == NULL)
 		return ASN1_MEM_ALLOC_ERROR;
 
@@ -370,7 +370,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 			{
 			  value_temp =
 			    (unsigned char *)
-			    _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT);
+			    _asn1_malloc (SIZEOF_UNSIGNED_LONG_INT);
 			  if (value_temp == NULL)
 			    return ASN1_MEM_ALLOC_ERROR;
 
@@ -389,7 +389,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 	}
       else
 	{			/* len != 0 */
-	  value_temp = (unsigned char *) _asn1_alloca (len);
+	  value_temp = (unsigned char *) _asn1_malloc (len);
 	  if (value_temp == NULL)
 	    return ASN1_MEM_ALLOC_ERROR;
 	  memcpy (value_temp, value, len);
@@ -403,7 +403,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 
       if (negative && (type_field (node->type) == TYPE_ENUMERATED))
 	{
-	  _asn1_afree (value_temp);
+	  _asn1_free (value_temp);
 	  return ASN1_VALUE_NOT_VALID;
 	}
 
@@ -418,14 +418,14 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 	k--;
 
       asn1_length_der (len - k, NULL, &len2);
-      temp = (unsigned char *) _asn1_alloca (len - k + len2);
+      temp = (unsigned char *) _asn1_malloc (len - k + len2);
       if (temp == NULL)
 	return ASN1_MEM_ALLOC_ERROR;
 
       asn1_octet_der (value_temp + k, len - k, temp, &len2);
       _asn1_set_value (node, temp, len2);
 
-      _asn1_afree (temp);
+      _asn1_free (temp);
 
 
       if (node->type & CONST_DEFAULT)
@@ -436,7 +436,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 	  if ((isdigit (p->value[0])) || (p->value[0] == '-'))
 	    {
 	      default_temp =
-		(unsigned char *) _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT);
+		(unsigned char *) _asn1_malloc (SIZEOF_UNSIGNED_LONG_INT);
 	      if (default_temp == NULL)
 		return ASN1_MEM_ALLOC_ERROR;
 
@@ -456,7 +456,7 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 			{
 			  default_temp =
 			    (unsigned char *)
-			    _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT);
+			    _asn1_malloc (SIZEOF_UNSIGNED_LONG_INT);
 			  if (default_temp == NULL)
 			    return ASN1_MEM_ALLOC_ERROR;
 
@@ -484,9 +484,9 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
 	      if (k2 == len2)
 		_asn1_set_value (node, NULL, 0);
 	    }
-	  _asn1_afree (default_temp);
+	  _asn1_free (default_temp);
 	}
-      _asn1_afree (value_temp);
+      _asn1_free (value_temp);
       break;
     case TYPE_OBJECT_ID:
       for (k = 0; k < strlen (value); k++)
@@ -555,37 +555,37 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
       if (len == 0)
 	len = strlen (value);
       asn1_length_der (len, NULL, &len2);
-      temp = (unsigned char *) _asn1_alloca (len + len2);
+      temp = (unsigned char *) _asn1_malloc (len + len2);
       if (temp == NULL)
 	return ASN1_MEM_ALLOC_ERROR;
 
       asn1_octet_der (value, len, temp, &len2);
       _asn1_set_value (node, temp, len2);
-      _asn1_afree (temp);
+      _asn1_free (temp);
       break;
     case TYPE_GENERALSTRING:
       if (len == 0)
 	len = strlen (value);
       asn1_length_der (len, NULL, &len2);
-      temp = (unsigned char *) _asn1_alloca (len + len2);
+      temp = (unsigned char *) _asn1_malloc (len + len2);
       if (temp == NULL)
 	return ASN1_MEM_ALLOC_ERROR;
 
       asn1_octet_der (value, len, temp, &len2);
       _asn1_set_value (node, temp, len2);
-      _asn1_afree (temp);
+      _asn1_free (temp);
       break;
     case TYPE_BIT_STRING:
       if (len == 0)
 	len = strlen (value);
       asn1_length_der ((len >> 3) + 2, NULL, &len2);
-      temp = (unsigned char *) _asn1_alloca ((len >> 3) + 2 + len2);
+      temp = (unsigned char *) _asn1_malloc ((len >> 3) + 2 + len2);
       if (temp == NULL)
 	return ASN1_MEM_ALLOC_ERROR;
 
       asn1_bit_der (value, len, temp, &len2);
       _asn1_set_value (node, temp, len2);
-      _asn1_afree (temp);
+      _asn1_free (temp);
       break;
     case TYPE_CHOICE:
       p = node->down;
@@ -613,13 +613,13 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
       break;
     case TYPE_ANY:
       asn1_length_der (len, NULL, &len2);
-      temp = (unsigned char *) _asn1_alloca (len + len2);
+      temp = (unsigned char *) _asn1_malloc (len + len2);
       if (temp == NULL)
 	return ASN1_MEM_ALLOC_ERROR;
 
       asn1_octet_der (value, len, temp, &len2);
       _asn1_set_value (node, temp, len2);
-      _asn1_afree (temp);
+      _asn1_free (temp);
       break;
     case TYPE_SEQUENCE_OF:
     case TYPE_SET_OF:
diff --git a/lib/minitasn1/int.h b/lib/minitasn1/int.h
index 5c897151a5..0c9c06f979 100644
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -45,7 +45,11 @@
 #define LIBTASN1_DEBUG_INTEGER
 */
 
-#include <mem.h>
+#define _asn1_malloc malloc
+#define _asn1_free free
+#define _asn1_calloc calloc
+#define _asn1_realloc realloc
+#define _asn1_strdup strdup
 
 #define MAX_LOG_SIZE 1024 /* maximum number of characters of a log message */
 
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index 8a192e4f46..fd35867367 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2005, 2006 Free Software Foundation
+ *      Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation
  *      Copyright (C) 2002 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
@@ -31,7 +31,7 @@ extern "C"
 {
 #endif
 
-#define LIBTASN1_VERSION "1.3"
+#define LIBTASN1_VERSION "1.4"
 
 #include <sys/types.h>
 #include <time.h>
diff --git a/lib/minitasn1/mem.h b/lib/minitasn1/mem.h
deleted file mode 100644
index 267f62f311..0000000000
--- a/lib/minitasn1/mem.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef MEM_H
-# define MEM_H
-
-/* Use _asn1_afree() when calling alloca, or
- * memory leaks may occur in systems which do not
- * support alloca.
- */
-#ifdef HAVE_ALLOCA
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# endif
-# define _asn1_alloca alloca
-# define _asn1_afree(x)
-#else
-# define _asn1_alloca _asn1_malloc
-# define _asn1_afree _asn1_free
-#endif /* HAVE_ALLOCA */
-
-#define _asn1_malloc malloc
-#define _asn1_free free
-#define _asn1_calloc calloc
-#define _asn1_realloc realloc
-#define _asn1_strdup strdup
-
-#endif /* MEM_H */
-
-
diff --git a/src/cli.c b/src/cli.c
index 01b8b9c94b..fafc389060 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -44,6 +44,8 @@
 #include "cli-gaa.h"
 
 #if defined _WIN32 || defined __WIN32__
+int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
+		const struct timeval *tv);
 #define select _win_select
 #endif
 
diff --git a/src/psk-gaa.c b/src/psk-gaa.c
index 5a77c3c3ee..928986e586 100644
--- a/src/psk-gaa.c
+++ b/src/psk-gaa.c
@@ -567,7 +567,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     {
 
 #line 28 "psk.gaa"
-{ gaaval->username=NULL; gaaval->passwd=NULL; gaaval->key_size = NULL; ;};
+{ gaaval->username=NULL; gaaval->passwd=NULL; gaaval->key_size = 0; ;};
 
     }
     inited = 1;
diff --git a/src/psk.gaa b/src/psk.gaa
index 24660b1487..db2edcf880 100644
--- a/src/psk.gaa
+++ b/src/psk.gaa
@@ -25,5 +25,5 @@ option (s, keysize) INT "SIZE" { $key_size = $1 } "specify the key size in bytes
 option (v, version) { psktool_version(); exit(0); } "prints the program's version number"
 option (h, help) { gaa_help(); exit(0); } "shows this help text"
 
-init { $username=NULL; $passwd=NULL; $key_size = NULL; }
+init { $username=NULL; $passwd=NULL; $key_size = 0; }
 
diff --git a/src/serv.c b/src/serv.c
index d77d0c67b9..2edaca30e6 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -39,6 +39,8 @@
 #include <list.h>
 
 #if defined _WIN32 || defined __WIN32__
+int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
+		const struct timeval *tv);
 #define select _win_select
 #endif
 
diff --git a/src/tests.c b/src/tests.c
index 130b5e16e0..66cd61baf4 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation
  * Copyright (C) 2000,2001,2002,2003 Nikos Mavrogiannopoulos
  *
  * This file is part of GNUTLS.
@@ -514,7 +514,7 @@ test_bye (gnutls_session_t session)
   old = siginterrupt (SIGALRM, 1);
   alarm (secs);
 #else
-  setsockopt (gnutls_transport_get_ptr (session), SOL_SOCKET, SO_RCVTIMEO,
+  setsockopt ((int)gnutls_transport_get_ptr (session), SOL_SOCKET, SO_RCVTIMEO,
 	      (char *) &secs, sizeof (int));
 #endif