[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-77-g53e86c9

[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=53e86c9b3491b429228940d56ffd0523ca945e98

The branch, master has been updated
       via  53e86c9b3491b429228940d56ffd0523ca945e98 (commit)
       via  9e99e32bc282c349c02171537296e3f812527ee9 (commit)
       via  885ecb81b381e08e18b313fbbc139995d99e2c00 (commit)
      from  67801c0111b4b0a9b95a7e1cb83a5ed626d99ee1 (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 53e86c9b3491b429228940d56ffd0523ca945e98
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 16 20:50:35 2012 +0200

    small updates

commit 9e99e32bc282c349c02171537296e3f812527ee9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 16 20:48:36 2012 +0200

    removed old libtasn1 requirements

commit 885ecb81b381e08e18b313fbbc139995d99e2c00
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 16 20:48:18 2012 +0200

    MAX_NAME_SIZE -> MAX_SERVER_NAME_SIZE

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

Summary of changes:
 lib/x509/mpi.c         |    3 ---
 lib/x509/verify-high.c |    4 ++--
 lib/x509/x509_int.h    |    8 --------
 tests/x509cert-tl.c    |    8 ++++----
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index baef1ee..c9d3058 100644
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -229,9 +229,6 @@ _gnutls_x509_write_sig_params (ASN1_TYPE dst, const char 
*dst_name,
   return 0;
 }
 
-
-
-
 /* this function reads a (small) unsigned integer
  * from asn1 structs. Combines the read and the convertion
  * steps.
diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index 0c299b1..cdc9ecf 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -35,7 +35,7 @@
 
 struct named_cert_st {
   gnutls_x509_crt_t cert;
-  uint8_t name[MAX_NAME_SIZE];
+  uint8_t name[MAX_SERVER_NAME_SIZE];
   unsigned int name_size;
 };
 
@@ -228,7 +228,7 @@ 
gnutls_x509_trust_list_add_named_crt(gnutls_x509_trust_list_t list,
     int ret;
     uint32_t hash;
 
-    if (name_size >= MAX_NAME_SIZE)
+    if (name_size >= MAX_SERVER_NAME_SIZE)
         return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
 
     ret = gnutls_x509_crt_get_raw_issuer_dn(cert, &dn);
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index c83edb0..28f6a4d 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -28,14 +28,6 @@
 
 #include <libtasn1.h>
 
-/* Remove these when we require libtasn1 v1.6 or later. */
-#ifndef ASN1_MAX_NAME_SIZE
-#define ASN1_MAX_NAME_SIZE MAX_NAME_SIZE
-#endif
-#ifndef ASN1_MAX_ERROR_DESCRIPTION_SIZE
-#define ASN1_MAX_ERROR_DESCRIPTION_SIZE MAX_ERROR_DESCRIPTION_SIZE
-#endif
-
 #define MAX_CRQ_EXTENSIONS_SIZE 8*1024
 #define MAX_OID_SIZE 128
 
diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c
index c2ff767..7a35992 100644
--- a/tests/x509cert-tl.c
+++ b/tests/x509cert-tl.c
@@ -244,16 +244,16 @@ doit (void)
 
   /* test convenience functions in verify-high2.c */
   data.data = cert_pem;
-  data.size = strlen(cert_pem);
+  data.size = strlen((char*)cert_pem);
   ret = gnutls_x509_trust_list_add_trust_mem(tl, &data, NULL, 
GNUTLS_X509_FMT_PEM, 0, 0);
   if (ret < 1)
-    fail("gnutls_x509_trust_list_add_trust_mem: %d\n", __LINE__);
+    fail("gnutls_x509_trust_list_add_trust_mem: %d (%s)\n", __LINE__, 
gnutls_strerror(ret));
 
   data.data = cert_der;
-  data.size = sizeof(cert_der);
+  data.size = sizeof((char*)cert_der);
   ret = gnutls_x509_trust_list_add_trust_mem(tl, &data, NULL, 
GNUTLS_X509_FMT_DER, 0, 0);
   if (ret < 1)
-    fail("gnutls_x509_trust_list_add_trust_mem: %d\n", __LINE__);
+    fail("gnutls_x509_trust_list_add_trust_mem: %d (%s)\n", __LINE__, 
gnutls_strerror(ret));
 
   gnutls_x509_trust_list_deinit(tl, 1);
   


hooks/post-receive
-- 
GNU gnutls