[SCM] GNU gnutls branch, master, updated. gnutls_3_0_4-10-g28805f3

[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=28805f3560b9354cbeb6a9295f169a40c1662f26

The branch, master has been updated
       via  28805f3560b9354cbeb6a9295f169a40c1662f26 (commit)
      from  7e8a47c58aef188e8d7f50014952e5eccf8f097f (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 28805f3560b9354cbeb6a9295f169a40c1662f26
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 21 08:54:24 2011 +0200

    removed more extra.h leftovers.

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

Summary of changes:
 NEWS                  |    2 +-
 extra/gnutls_extra.c  |   93 -------------------------------------------------
 guile/src/extra.c     |    1 -
 lib/auth/srp_passwd.c |    2 +-
 lib/gnutls_srp.c      |    4 +-
 5 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100644 extra/gnutls_extra.c

diff --git a/NEWS b/NEWS
index f7ac31c..c26f87a 100644
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,7 @@ operate with TLS 1.2.
 ID. Reported by Erik Jensen.
 
 ** libgnutls: Corrected VIA padlock code for C3. In C3 benchmarks 
-show a 2x increase in AES speed and a 14x increase in VIA nano. Added 
+show a 50x increase in AES speed and a 14x increase in VIA nano. Added 
 support for hashes and HMACs.
 
 ** libgnutls: Compilation fixed when p11-kit is not detected.
diff --git a/extra/gnutls_extra.c b/extra/gnutls_extra.c
deleted file mode 100644
index a7a4b80..0000000
--- a/extra/gnutls_extra.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GnuTLS-EXTRA.
- *
- * GnuTLS-extra is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * GnuTLS-extra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_extensions.h>
-#include <algorithms.h>
-#include <gnutls/extra.h>
-
-#ifdef HAVE_GCRYPT
-#include <gcrypt.h>
-#endif
-
-static int _gnutls_init_extra = 0;
-
-/**
- * gnutls_global_init_extra:
- *
- * This function initializes the global state of gnutls-extra library
- * to defaults.
- *
- * Note that gnutls_global_init() has to be called before this
- * function.  If this function is not called then the gnutls-extra
- * library will not be usable.
- *
- * This function is not thread safe, see the discussion for
- * gnutls_global_init() on how to deal with that.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned,
- *   otherwise an error code is returned.
- **/
-int
-gnutls_global_init_extra (void)
-{
-  /* If the version of libgnutls != version of
-   * libextra, then do not initialize the library.
-   * This is because it may break things.
-   */
-  if (strcmp (gnutls_check_version (NULL), VERSION) != 0)
-    {
-      return GNUTLS_E_LIBRARY_VERSION_MISMATCH;
-    }
-
-  _gnutls_init_extra++;
-
-  if (_gnutls_init_extra != 1)
-    return 0;
-
-  return 0;
-}
-
-/**
- * gnutls_extra_check_version:
- * @req_version: version string to compare with, or %NULL.
- *
- * Check GnuTLS Extra Library version.
- *
- * See %GNUTLS_EXTRA_VERSION for a suitable @req_version string.
- *
- * Return value: Check that the version of the library is at
- *   minimum the one given as a string in @req_version and return the
- *   actual version string of the library; return %NULL if the
- *   condition is not met.  If %NULL is passed to this function no
- *   check is done and only the version string is returned.
- **/
-const char *
-gnutls_extra_check_version (const char *req_version)
-{
-  if (!req_version || strverscmp (req_version, VERSION) <= 0)
-    return VERSION;
-
-  return NULL;
-}
diff --git a/guile/src/extra.c b/guile/src/extra.c
index 1cbbb88..ae4117f 100644
--- a/guile/src/extra.c
+++ b/guile/src/extra.c
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/openpgp.h>
 #include <libguile.h>
 
diff --git a/lib/auth/srp_passwd.c b/lib/auth/srp_passwd.c
index a06ae9d..9b1df7e 100644
--- a/lib/auth/srp_passwd.c
+++ b/lib/auth/srp_passwd.c
@@ -446,7 +446,7 @@ _randomize_pwd_entry (SRP_PWD_ENTRY * entry)
 }
 
 /* Free all the entry parameters, except if g and n are
- * the static ones defined in extra.h
+ * the static ones defined in gnutls.h
  */
 void
 _gnutls_srp_entry_free (SRP_PWD_ENTRY * entry)
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index 4509834..2339649 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -579,7 +579,7 @@ gnutls_srp_set_server_credentials_file 
(gnutls_srp_server_credentials_t res,
  * @username contains the actual username.
  * The @salt, @verifier, @generator and @prime must be filled
  * in using the gnutls_malloc(). For convenience @prime and @generator
- * may also be one of the static parameters defined in extra.h.
+ * may also be one of the static parameters defined in gnutls.h.
  *
  * In case the callback returned a negative number then gnutls will
  * assume that the username does not exist.
@@ -671,7 +671,7 @@ gnutls_srp_server_get_username (gnutls_session_t session)
  *
  * This function will create an SRP verifier, as specified in
  * RFC2945.  The @prime and @generator should be one of the static
- * parameters defined in gnutls/extra.h or may be generated.
+ * parameters defined in gnutls/gnutls.h or may be generated.
  *
  * The verifier will be allocated with @gnutls_malloc() and will be stored in
  * @res using binary format.


hooks/post-receive
-- 
GNU gnutls