[SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-11-g657d933

[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=657d9334635a1c4c08fc6e003e3378062f58aa6d

The branch, master has been updated
       via  657d9334635a1c4c08fc6e003e3378062f58aa6d (commit)
       via  3c37902adad2c4dd5d22b2d2fcc3e9c947b1a4cb (commit)
       via  4f9bc0fd8acc771b905ffc8de86b40150a305282 (commit)
       via  d3e402a44ed289607d422eadcab0012e64fb37f0 (commit)
      from  85987530d41198b448995b9e093788a292040cb6 (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 657d9334635a1c4c08fc6e003e3378062f58aa6d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 1 08:33:29 2011 +0100

    read_file() and friends are accessed as gl_read_file().

commit 3c37902adad2c4dd5d22b2d2fcc3e9c947b1a4cb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 1 08:30:42 2011 +0100

    read_file and friends were renamed to gl_read_file.

commit 4f9bc0fd8acc771b905ffc8de86b40150a305282
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 30 16:31:58 2011 +0100

    added David

commit d3e402a44ed289607d422eadcab0012e64fb37f0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Oct 30 16:30:31 2011 +0100

    documented fix

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

Summary of changes:
 NEWS                                    |    8 ++++++
 THANKS                                  |    3 +-
 gl/override/lib/read-file.c.diff        |   38 +++++++++++++++++++++++++++++++
 gl/override/lib/read-file.h.diff        |   16 +++++++++++++
 gl/override/tests/test-read-file.c.diff |   20 ++++++++++++++++
 gl/read-file.c                          |    8 +++---
 gl/read-file.h                          |    6 ++--
 gl/tests/test-read-file.c               |    4 +-
 lib/gnutls_x509.c                       |   10 ++++----
 lib/openpgp/gnutls_openpgp.c            |    6 ++--
 src/certtool-common.c                   |   12 +++++-----
 src/certtool.c                          |   22 +++++++++---------
 src/cli.c                               |    2 +-
 src/crywrap/crywrap.c                   |    2 +-
 14 files changed, 120 insertions(+), 37 deletions(-)
 create mode 100644 gl/override/lib/read-file.c.diff
 create mode 100644 gl/override/lib/read-file.h.diff
 create mode 100644 gl/override/tests/test-read-file.c.diff

diff --git a/NEWS b/NEWS
index 9943e1e..cbd1e98 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,14 @@ GnuTLS NEWS -- History of user-visible changes.                
-*- outline -*-
 Copyright (C) 2000-2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 3.0.6 (unreleased)
+
+** gnutls-guile: Compilation fixes.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 3.0.5 (released 2011-10-27)
 
 ** libgnutls-extra: is no more
diff --git a/THANKS b/THANKS
index c50bb40..5782be4 100644
--- a/THANKS
+++ b/THANKS
@@ -121,7 +121,8 @@ Jonathan Nieder                 *jrnider [at] gmail.com*
 J. Cameijo Cerdeira             *cerdeira [at] co.sapo.pt*
 Benjamin Hof                    *benjamin.hof [at] stusta.net*
 Vincent Untz                    *vuntz [at] gnome.org*
-Jan Misiak                      address@hidden
+Jan Misiak                      *fijam [at] archlinux.us*
+David Hoyt                      *hoyt6 [at] llnl.gov*
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/gl/override/lib/read-file.c.diff b/gl/override/lib/read-file.c.diff
new file mode 100644
index 0000000..2907631
--- /dev/null
+++ b/gl/override/lib/read-file.c.diff
@@ -0,0 +1,38 @@
+--- read-file.c.orig
++++ read-file.c
+@@ -41,7 +41,7 @@
+    *LENGTH.  On errors, *LENGTH is undefined, errno preserves the
+    values set by system functions (if any), and NULL is returned.  */
+ char *
+-fread_file (FILE *stream, size_t *length)
++gl_fread_file (FILE *stream, size_t *length)
+ {
+   char *buf = NULL;
+   size_t alloc = BUFSIZ;
+@@ -145,7 +145,7 @@ internal_read_file (const char *filename, size_t *length, 
const char *mode)
+   if (!stream)
+     return NULL;
+ 
+-  out = fread_file (stream, length);
++  out = gl_fread_file (stream, length);
+ 
+   save_errno = errno;
+ 
+@@ -170,7 +170,7 @@ internal_read_file (const char *filename, size_t *length, 
const char *mode)
+    undefined, errno preserves the values set by system functions (if
+    any), and NULL is returned.  */
+ char *
+-read_file (const char *filename, size_t *length)
++gl_read_file (const char *filename, size_t *length)
+ {
+   return internal_read_file (filename, length, "r");
+ }
+@@ -183,7 +183,7 @@ read_file (const char *filename, size_t *length)
+    preserves the values set by system functions (if any), and NULL is
+    returned.  */
+ char *
+-read_binary_file (const char *filename, size_t *length)
++gl_read_binary_file (const char *filename, size_t *length)
+ {
+   return internal_read_file (filename, length, "rb");
+ }
diff --git a/gl/override/lib/read-file.h.diff b/gl/override/lib/read-file.h.diff
new file mode 100644
index 0000000..3731bc7
--- /dev/null
+++ b/gl/override/lib/read-file.h.diff
@@ -0,0 +1,16 @@
+--- read-file.h.orig
++++ read-file.h
+@@ -25,10 +25,10 @@
+ /* Get FILE.  */
+ #include <stdio.h>
+ 
+-extern char *fread_file (FILE * stream, size_t * length);
++extern char *gl_fread_file (FILE * stream, size_t * length);
+ 
+-extern char *read_file (const char *filename, size_t * length);
++extern char *gl_read_file (const char *filename, size_t * length);
+ 
+-extern char *read_binary_file (const char *filename, size_t * length);
++extern char *gl_read_binary_file (const char *filename, size_t * length);
+ 
+ #endif /* READ_FILE_H */
diff --git a/gl/override/tests/test-read-file.c.diff 
b/gl/override/tests/test-read-file.c.diff
new file mode 100644
index 0000000..1c25c30
--- /dev/null
+++ b/gl/override/tests/test-read-file.c.diff
@@ -0,0 +1,20 @@
+--- test-read-file.c.orig
++++ test-read-file.c
+@@ -37,7 +37,7 @@ main (void)
+   if (stat (FILE1, &statbuf) >= 0)
+     {
+       size_t len;
+-      char *out = read_file (FILE1, &len);
++      char *out = gl_read_file (FILE1, &len);
+ 
+       if (!out)
+         {
+@@ -79,7 +79,7 @@ main (void)
+   if (stat (FILE2, &statbuf) >= 0)
+     {
+       size_t len;
+-      char *out = read_file (FILE2, &len);
++      char *out = gl_read_file (FILE2, &len);
+ 
+       if (!out)
+         {
diff --git a/gl/read-file.c b/gl/read-file.c
index bcbfbbb..0e6c383 100644
--- a/gl/read-file.c
+++ b/gl/read-file.c
@@ -41,7 +41,7 @@
    *LENGTH.  On errors, *LENGTH is undefined, errno preserves the
    values set by system functions (if any), and NULL is returned.  */
 char *
-fread_file (FILE *stream, size_t *length)
+gl_fread_file (FILE *stream, size_t *length)
 {
   char *buf = NULL;
   size_t alloc = BUFSIZ;
@@ -145,7 +145,7 @@ internal_read_file (const char *filename, size_t *length, 
const char *mode)
   if (!stream)
     return NULL;
 
-  out = fread_file (stream, length);
+  out = gl_fread_file (stream, length);
 
   save_errno = errno;
 
@@ -170,7 +170,7 @@ internal_read_file (const char *filename, size_t *length, 
const char *mode)
    undefined, errno preserves the values set by system functions (if
    any), and NULL is returned.  */
 char *
-read_file (const char *filename, size_t *length)
+gl_read_file (const char *filename, size_t *length)
 {
   return internal_read_file (filename, length, "r");
 }
@@ -183,7 +183,7 @@ read_file (const char *filename, size_t *length)
    preserves the values set by system functions (if any), and NULL is
    returned.  */
 char *
-read_binary_file (const char *filename, size_t *length)
+gl_read_binary_file (const char *filename, size_t *length)
 {
   return internal_read_file (filename, length, "rb");
 }
diff --git a/gl/read-file.h b/gl/read-file.h
index 42663ef..70d88d6 100644
--- a/gl/read-file.h
+++ b/gl/read-file.h
@@ -25,10 +25,10 @@
 /* Get FILE.  */
 #include <stdio.h>
 
-extern char *fread_file (FILE * stream, size_t * length);
+extern char *gl_fread_file (FILE * stream, size_t * length);
 
-extern char *read_file (const char *filename, size_t * length);
+extern char *gl_read_file (const char *filename, size_t * length);
 
-extern char *read_binary_file (const char *filename, size_t * length);
+extern char *gl_read_binary_file (const char *filename, size_t * length);
 
 #endif /* READ_FILE_H */
diff --git a/gl/tests/test-read-file.c b/gl/tests/test-read-file.c
index de7a0bb..23c1b75 100644
--- a/gl/tests/test-read-file.c
+++ b/gl/tests/test-read-file.c
@@ -37,7 +37,7 @@ main (void)
   if (stat (FILE1, &statbuf) >= 0)
     {
       size_t len;
-      char *out = read_file (FILE1, &len);
+      char *out = gl_read_file (FILE1, &len);
 
       if (!out)
         {
@@ -79,7 +79,7 @@ main (void)
   if (stat (FILE2, &statbuf) >= 0)
     {
       size_t len;
-      char *out = read_file (FILE2, &len);
+      char *out = gl_read_file (FILE2, &len);
 
       if (!out)
         {
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index c86c4ed..d5f3a15 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -793,7 +793,7 @@ read_cert_file (gnutls_certificate_credentials_t res,
     }
 #endif /* ENABLE_PKCS11 */
 
-  data = read_binary_file (certfile, &size);
+  data = gl_read_binary_file (certfile, &size);
 
   if (data == NULL)
     {
@@ -828,7 +828,7 @@ read_key_file (gnutls_certificate_credentials_t res,
     }
 #endif /* ENABLE_PKCS11 */
 
-  data = read_binary_file (keyfile, &size);
+  data = gl_read_binary_file (keyfile, &size);
 
   if (data == NULL)
     {
@@ -1569,7 +1569,7 @@ gnutls_certificate_set_x509_trust_file 
(gnutls_certificate_credentials_t cred,
     }
 #endif
 
-  cas.data = read_binary_file (cafile, &size);
+  cas.data = gl_read_binary_file (cafile, &size);
   if (cas.data == NULL)
     {
       gnutls_assert ();
@@ -1790,7 +1790,7 @@ gnutls_certificate_set_x509_crl_file 
(gnutls_certificate_credentials_t res,
 {
   int ret;
   size_t size;
-  char *data = read_binary_file (crlfile, &size);
+  char *data = gl_read_binary_file (crlfile, &size);
 
   if (data == NULL)
     {
@@ -2155,7 +2155,7 @@ int
   size_t size;
   int ret;
 
-  p12blob.data = read_binary_file (pkcs12file, &size);
+  p12blob.data = gl_read_binary_file (pkcs12file, &size);
   p12blob.size = (unsigned int) size;
   if (p12blob.data == NULL)
     {
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index ae7320a..b1c7c1f 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -452,7 +452,7 @@ gnutls_certificate_set_openpgp_key_file2 
(gnutls_certificate_credentials_t
       return GNUTLS_E_FILE_ERROR;
     }
 
-  cert.data = read_binary_file (certfile, &size);
+  cert.data = gl_read_binary_file (certfile, &size);
   cert.size = (unsigned int) size;
   if (cert.data == NULL)
     {
@@ -460,7 +460,7 @@ gnutls_certificate_set_openpgp_key_file2 
(gnutls_certificate_credentials_t
       return GNUTLS_E_FILE_ERROR;
     }
 
-  key.data = read_binary_file (keyfile, &size);
+  key.data = gl_read_binary_file (keyfile, &size);
   key.size = (unsigned int) size;
   if (key.data == NULL)
     {
@@ -549,7 +549,7 @@ gnutls_certificate_set_openpgp_keyring_file 
(gnutls_certificate_credentials_t c,
       return GNUTLS_E_INVALID_REQUEST;
     }
 
-  ring.data = read_binary_file (file, &size);
+  ring.data = gl_read_binary_file (file, &size);
   ring.size = (unsigned int) size;
   if (ring.data == NULL)
     {
diff --git a/src/certtool-common.c b/src/certtool-common.c
index 9f87ae8..7e547a6 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -281,7 +281,7 @@ load_private_key (int mand, common_info_st * info)
     return _load_pkcs11_privkey(info->privkey);
 #endif
 
-  dat.data = read_binary_file (info->privkey, &size);
+  dat.data = gl_read_binary_file (info->privkey, &size);
   dat.size = size;
 
   if (!dat.data)
@@ -315,7 +315,7 @@ load_x509_private_key (int mand, common_info_st * info)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "privkey_init: %s", gnutls_strerror (ret));
 
-  dat.data = read_binary_file (info->privkey, &size);
+  dat.data = gl_read_binary_file (info->privkey, &size);
   dat.size = size;
 
   if (!dat.data)
@@ -451,7 +451,7 @@ load_request (common_info_st * info)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "crq_init: %s", gnutls_strerror (ret));
 
-  dat.data = read_binary_file (info->request, &size);
+  dat.data = gl_read_binary_file (info->request, &size);
   dat.size = size;
 
   if (!dat.data)
@@ -489,7 +489,7 @@ load_ca_private_key (common_info_st * info)
     return _load_pkcs11_privkey(info->ca_privkey);
 #endif
 
-  dat.data = read_binary_file (info->ca_privkey, &size);
+  dat.data = gl_read_binary_file (info->ca_privkey, &size);
   dat.size = size;
 
   if (!dat.data)
@@ -520,7 +520,7 @@ load_ca_cert (common_info_st * info)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "crt_init: %s", gnutls_strerror (ret));
 
-  dat.data = read_binary_file (info->ca, &size);
+  dat.data = gl_read_binary_file (info->ca, &size);
   dat.size = size;
 
   if (!dat.data)
@@ -562,7 +562,7 @@ load_pubkey (int mand, common_info_st * info)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "privkey_init: %s", gnutls_strerror (ret));
 
-  dat.data = read_binary_file (info->pubkey, &size);
+  dat.data = gl_read_binary_file (info->pubkey, &size);
   dat.size = size;
 
   if (!dat.data)
diff --git a/src/certtool.c b/src/certtool.c
index 824165a..09f31e2 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1155,7 +1155,7 @@ certificate_info (int pubkey, common_info_st * cinfo)
   gnutls_datum_t pem;
   unsigned int crt_num;
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   crt_num = MAX_CRTS;
@@ -1218,7 +1218,7 @@ pgp_certificate_info (void)
   gnutls_datum_t pem, out_data;
   unsigned int verify_status;
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   ret = gnutls_openpgp_crt_init (&crt);
@@ -1405,7 +1405,7 @@ pgp_ring_info (void)
   int ret, i, count;
   gnutls_datum_t pem;
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   ret = gnutls_openpgp_keyring_init (&ring);
@@ -1526,7 +1526,7 @@ crl_info (void)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "crl_init: %s", gnutls_strerror (ret));
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   if (!pem.data)
@@ -1582,7 +1582,7 @@ crq_info (void)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "crq_init: %s", gnutls_strerror (ret));
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   if (!pem.data)
@@ -2159,7 +2159,7 @@ verify_chain (void)
   char *buf;
   size_t size;
 
-  buf = fread_file (infile, &size);
+  buf = gl_fread_file (infile, &size);
   if (buf == NULL)
     error (EXIT_FAILURE, errno, "reading chain");
 
@@ -2180,13 +2180,13 @@ verify_certificate (common_info_st * cinfo)
   if (ca_file == NULL)
     error (EXIT_FAILURE, errno, "opening CA file");
 
-  cert = fread_file (infile, &cert_size);
+  cert = gl_fread_file (infile, &cert_size);
   if (cert == NULL)
     error (EXIT_FAILURE, errno, "reading certificate chain");
 
   cert[cert_size] = 0;
 
-  cas = fread_file (ca_file, &ca_size);
+  cas = gl_fread_file (ca_file, &ca_size);
   if (cas == NULL)
     error (EXIT_FAILURE, errno, "reading CA list");
 
@@ -2226,7 +2226,7 @@ verify_crl (common_info_st * cinfo)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "crl_init: %s", gnutls_strerror (ret));
 
-  pem.data = fread_file (infile, &size);
+  pem.data = gl_fread_file (infile, &size);
   pem.size = size;
 
   ret = gnutls_x509_crl_import (crl, &pem, info.incert_format);
@@ -2601,7 +2601,7 @@ pkcs12_info (void)
   if (result < 0)
     error (EXIT_FAILURE, 0, "p12_init: %s", gnutls_strerror (result));
 
-  data.data = fread_file (infile, &size);
+  data.data = gl_fread_file (infile, &size);
   data.size = size;
 
   result = gnutls_pkcs12_import (pkcs12, &data, info.incert_format, 0);
@@ -2676,7 +2676,7 @@ pkcs7_info (void)
   if (result < 0)
     error (EXIT_FAILURE, 0, "p7_init: %s", gnutls_strerror (result));
 
-  data.data = fread_file (infile, &size);
+  data.data = gl_fread_file (infile, &size);
   data.size = size;
 
   result = gnutls_pkcs7_import (pkcs7, &data, info.incert_format);
diff --git a/src/cli.c b/src/cli.c
index 946dc85..27b18ab 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -123,7 +123,7 @@ load_file (const char *file)
   gnutls_datum_t loaded_file = { NULL, 0 };
   size_t length;
 
-  loaded_file.data = read_binary_file (file, &length);
+  loaded_file.data = gl_read_binary_file (file, &length);
   if (loaded_file.data)
     loaded_file.size = (unsigned int) length;
 
diff --git a/src/crywrap/crywrap.c b/src/crywrap/crywrap.c
index da41f85..24ed8fc 100644
--- a/src/crywrap/crywrap.c
+++ b/src/crywrap/crywrap.c
@@ -203,7 +203,7 @@ load_file (const char *file)
   gnutls_datum_t loaded_file = { NULL, 0 };
   size_t length;
 
-  loaded_file.data = read_binary_file (file, &length);
+  loaded_file.data = gl_read_binary_file (file, &length);
   if (loaded_file.data)
     loaded_file.size = (unsigned int) length;
 


hooks/post-receive
-- 
GNU gnutls