[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-29-gbef37bc

[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=bef37bc1f17c833f8a21c2bebd39baaa343b20d3

The branch, master has been updated
       via  bef37bc1f17c833f8a21c2bebd39baaa343b20d3 (commit)
      from  8e46c951536641a7a5e08e79570040492a5cf0b3 (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 bef37bc1f17c833f8a21c2bebd39baaa343b20d3
Author: Simon Josefsson <address@hidden>
Date:   Fri May 21 09:39:08 2010 +0200

    Remove gnutls_safe_negotiation_set_initial and 
gnutls_safe_renegotiation_set.

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

Summary of changes:
 NEWS                            |    9 ++++++++-
 doc/announce.txt                |   11 ++---------
 doc/gnutls.texi                 |   10 ++--------
 doc/manpages/Makefile.am        |    2 --
 lib/ext_safe_renegotiation.c    |   37 -------------------------------------
 lib/includes/gnutls/gnutls.h.in |    5 -----
 lib/libgnutls.map               |    2 --
 tests/safe-renegotiation/srn2.c |    8 ++++----
 8 files changed, 16 insertions(+), 68 deletions(-)

diff --git a/NEWS b/NEWS
index 5aa687d..9514582 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,15 @@ See the end for copying conditions.
 
 * Version 2.9.11 (unreleased)
 
+** Removed two APIs related to safe renegotiation.
+Use priority strings instead.  The APIs were
+gnutls_safe_negotiation_set_initial and gnutls_safe_renegotiation_set.
+(Remember that we don't promise ABI stability during development
+series, so this doesn't cause an shared library ABI increment.)
+
 ** API and ABI modifications:
-No changes since last version.
+gnutls_safe_negotiation_set_initial: REMOVED.
+gnutls_safe_renegotiation_set: REMOVED.
 
 * Version 2.9.10 (released 2010-04-22)
 
diff --git a/doc/announce.txt b/doc/announce.txt
index 5eaf504..eba909e 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -312,15 +312,10 @@ is possible to disable use of the extension completely by 
using the
 `%DISABLE_SAFE_RENEGOTIATION' priority string however this is
 recommended against except for debugging.
 
-For applications we have introduced three new APIs related to safe
+For applications we have introduced a new API related to safe
 renegotiation.  The gnutls_safe_renegotiation_status function is used
 to check if the extension has been negotiated on a session, and can be
-used both by clients and servers.  The gnutls_safe_renegotiation_set
-function allows applications to request that the extension should be
-disabled (or re-enabled) in handshakes for the session.  The
-gnutls_safe_negotiation_set_initial function is only relevant for
-servers, and is used to enforce that clients support the extension
-even on the initial handshake.
+used both by clients and servers.
 
 API/ABI changes in GnuTLS 2.10
 ==============================
@@ -349,8 +344,6 @@ gnutls_hmac_fast: ADDED.
 gnutls_hmac_get_len: ADDED.
 gnutls_hmac_init: ADDED.
 gnutls_hmac_output: ADDED.
-gnutls_safe_negotiation_set_initial: ADDED.
-gnutls_safe_renegotiation_set: ADDED.
 gnutls_safe_renegotiation_status: ADDED.
 gnutls_sign_algorithm_get_requested: ADDED.
 
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 1748306..cf6185e 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -1289,16 +1289,10 @@ priority string.  It is possible to disable use of the 
extension
 completely by using the @code{%DISABLE_SAFE_RENEGOTIATION} priority
 string however this is recommended against except for debugging.
 
-For applications we have introduced three new APIs related to safe
+For applications we have introduced a new API related to safe
 renegotiation.  The @ref{gnutls_safe_renegotiation_status} function is
 used to check if the extension has been negotiated on a session, and
-can be used both by clients and servers.  The
address@hidden function allows applications to
-request that the extension should be disabled (or re-enabled) in
-handshakes for the session.  The
address@hidden function is only relevant
-for servers, and is used to enforce that clients support the extension
-even on the initial handshake.
+can be used both by clients and servers.
 
 @node Authentication methods
 @chapter Authentication Methods
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 655e2d8..36d92db 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -55,8 +55,6 @@ APIMANS += gnutls_crypto_mac_register2.3
 APIMANS += gnutls_crypto_digest_register2.3
 APIMANS += gnutls_oprfi_enable_client.3
 APIMANS += gnutls_oprfi_enable_server.3
-APIMANS += gnutls_safe_negotiation_set_initial.3
-APIMANS += gnutls_safe_renegotiation_set.3
 APIMANS += gnutls_safe_renegotiation_status.3
 APIMANS += gnutls_server_name_get.3
 APIMANS += gnutls_server_name_set.3
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index da1a4f6..15b9137 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -118,43 +118,6 @@ _gnutls_safe_renegotiation_send_params (gnutls_session_t 
session,
 }
 
 /**
- * gnutls_safe_negotiation_set_initial:
- * @session: is a #gnutls_session_t structure.
- * @value: 0 to disable and 1 to enable
- *
- * Used to enable and disable initial safe renegotiation for the
- * current session. By default it is allowed for a client to not
- * advertise safe renegotiation capability but there might be cases
- * where signalling a client of its insecurity by rejecting session
- * might be beneficial.  This option has meaning only in server side.
- *
- * Since: 2.10.0
- **/
-void
-gnutls_safe_negotiation_set_initial (gnutls_session_t session, int value)
-{
-  session->internals.priorities.initial_safe_renegotiation = value;
-}
-
-/**
- * gnutls_safe_renegotiation_set:
- * @session: is a #gnutls_session_t structure.
- * @value: 0 to disable and 1 to enable
- *
- * Used to enable and disable safe renegotiation for the current
- * session. Normally you shouldn't cope with this function since the
- * default (enable) is sufficient, but there might be servers that
- * cannot handle or correctly handle the extension.
- *
- * Since: 2.10.0
- **/
-void
-gnutls_safe_renegotiation_set (gnutls_session_t session, int value)
-{
-  session->internals.priorities.unsafe_renegotiation = 1 - value;
-}
-
-/**
  * gnutls_safe_renegotiation_status:
  * @session: is a #gnutls_session_t structure.
  *
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 8f19802..56ff192 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -812,11 +812,6 @@ extern "C"
                              unsigned int *type, unsigned int indx);
 
   /* Safe renegotiation */
-  void gnutls_safe_negotiation_set_initial (gnutls_session_t session,
-                                           int value);
-
-  void gnutls_safe_renegotiation_set (gnutls_session_t session, int value);
-
   int gnutls_safe_renegotiation_status (gnutls_session_t session);
 
   /* Opaque PRF Input
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 5dfc75d..4d16557 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -599,8 +599,6 @@ GNUTLS_2_10
     gnutls_hmac_deinit;
     gnutls_hmac_output;
     gnutls_certificate_set_verify_function;
-    gnutls_safe_negotiation_set_initial;
-    gnutls_safe_renegotiation_set;
     gnutls_safe_renegotiation_status;
 } GNUTLS_2_8;
 
diff --git a/tests/safe-renegotiation/srn2.c b/tests/safe-renegotiation/srn2.c
index 0f4041f..e9ac540 100644
--- a/tests/safe-renegotiation/srn2.c
+++ b/tests/safe-renegotiation/srn2.c
@@ -312,8 +312,8 @@ main (int argc, char *argv[])
     }
 
   /* Check that this API does not affect anything after first
-     handshake. */
-  gnutls_safe_negotiation_set_initial (server, 0);
+     handshake.
+  gnutls_safe_negotiation_set_initial (server, 0); */
 
   sret = gnutls_rehandshake (server);
   if (debug_level > 0)
@@ -371,8 +371,8 @@ main (int argc, char *argv[])
   if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS)
     exit_code = 1;
 
-  /* Check that disabling the extension will break rehandshakes. */
-  gnutls_safe_renegotiation_set (client, 0);
+  /* Check that disabling the extension will break rehandshakes.
+     gnutls_safe_renegotiation_set (client, 0); */
 
   sret = gnutls_rehandshake (server);
   if (debug_level > 0)


hooks/post-receive
-- 
GNU gnutls