[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-42-g95bec0f

[Simon Josefsson]

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=95bec0fb1aa37dad34cbd8411ca51bbe51262b3e

The branch, master has been updated
       via  95bec0fb1aa37dad34cbd8411ca51bbe51262b3e (commit)
       via  e71de0c575571ae86b507b9c1678ef53fa9e64fd (commit)
      from  93faa4cb6d5c063f982bcb721ada1590f35c63d4 (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 95bec0fb1aa37dad34cbd8411ca51bbe51262b3e
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 11:08:12 2011 +0100

    Don't crash if gnutls_pubkey_deinit is given a NULL key.

commit e71de0c575571ae86b507b9c1678ef53fa9e64fd
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 11:02:17 2011 +0100

    Remove dead code and use more static.

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

Summary of changes:
 lib/gnutls_pubkey.c |    4 +++-
 lib/x509_b64.c      |   37 ++-----------------------------------
 lib/x509_b64.h      |    4 ----
 3 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 74ce0b8..fbbaa57 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -157,7 +157,9 @@ gnutls_pubkey_init (gnutls_pubkey_t * key)
 void
 gnutls_pubkey_deinit (gnutls_pubkey_t key)
 {
-  gnutls_pk_params_release(&key->params);
+  if (!key)
+    return;
+  gnutls_pk_params_release (&key->params);
   gnutls_free (key);
 }
 
diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 4da11fe..f0fbb74 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2010 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2000-2011 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -137,38 +136,6 @@ decode (uint8_t * result, const opaque * data)
   return ret;
 }
 
-/* encodes data and puts the result into result (locally allocated)
- * The result_size is the return value
- */
-int
-_gnutls_base64_encode (const uint8_t * data, size_t data_size,
-                       uint8_t ** result)
-{
-  unsigned int i, j;
-  int ret, tmp;
-  char tmpres[4];
-
-  ret = B64SIZE (data_size);
-
-  (*result) = gnutls_malloc (ret + 1);
-  if ((*result) == NULL)
-    return GNUTLS_E_MEMORY_ERROR;
-
-  for (i = j = 0; i < data_size; i += 3, j += 4)
-    {
-      tmp = encode (tmpres, &data[i], data_size - i);
-      if (tmp == -1)
-        {
-          gnutls_free ((*result));
-          return GNUTLS_E_MEMORY_ERROR;
-        }
-      memcpy (&(*result)[j], tmpres, tmp);
-    }
-  (*result)[ret] = 0;           /* null terminated */
-
-  return ret;
-}
-
 #define INCR(what, size) \
        do { \
        what+=size; \
@@ -365,7 +332,7 @@ gnutls_pem_base64_encode_alloc (const char *msg,
 /* decodes data and puts the result into result (locally allocated)
  * The result_size is the return value
  */
-int
+static int
 _gnutls_base64_decode (const uint8_t * data, size_t data_size,
                        uint8_t ** result)
 {
diff --git a/lib/x509_b64.h b/lib/x509_b64.h
index 10bc9fa..a3bf135 100644
--- a/lib/x509_b64.h
+++ b/lib/x509_b64.h
@@ -20,12 +20,8 @@
  *
  */
 
-int _gnutls_base64_encode (const uint8_t * data, size_t data_size,
-                           uint8_t ** result);
 int _gnutls_fbase64_encode (const char *msg, const uint8_t * data,
                             int data_size, uint8_t ** result);
-int _gnutls_base64_decode (const uint8_t * data, size_t data_size,
-                           uint8_t ** result);
 int _gnutls_fbase64_decode (const char *header, const uint8_t * data,
                             size_t data_size, uint8_t ** result);
 


hooks/post-receive
-- 
GNU gnutls