[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-167-g9c903a1

[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=9c903a14e6767d6bea1a220a88574bd49e54fcbf

The branch, master has been updated
       via  9c903a14e6767d6bea1a220a88574bd49e54fcbf (commit)
      from  982e81d30114da4bda95e28f522eb06b20a1481b (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 9c903a14e6767d6bea1a220a88574bd49e54fcbf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 17 10:13:05 2010 +0100

    INITIAL_SAFE_RENEGOTIATION implies SAFE_RENEGOTIATION.

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

Summary of changes:
 lib/gnutls_priority.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 36bdc63..d9d4809 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -529,7 +529,8 @@ gnutls_priority_set (gnutls_session_t session, 
gnutls_priority_t priority)
  * "%SAFE_RENEGOTIATION" will allow safe renegotiation only.
  *
  * "%INITIAL_SAFE_RENEGOTIATION" will force initial safe negotiation even if 
- * renegotiation wasn't requested. Only valid for server side.
+ * renegotiation wasn't requested. Only valid for server side and implies
+ * "%SAFE_RENEGOTIATION".
  *
  * "%DISABLE_SAFE_RENEGOTIATION" will disable safe renegotiation completely. 
Do not use
  * unless you know what you are doing. Testing purposes only.
@@ -732,7 +733,10 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
            (*priority_cache)->unsafe_renegotiation = 0;
          else if (strcasecmp (&broken_list[i][1],
                               "INITIAL_SAFE_RENEGOTIATION") == 0)
-           (*priority_cache)->initial_safe_renegotiation = 1;
+            {
+             (*priority_cache)->unsafe_renegotiation = 0;
+             (*priority_cache)->initial_safe_renegotiation = 1;
+            }
          else if (strcasecmp (&broken_list[i][1],
                               "DISABLE_SAFE_RENEGOTIATION") == 0)
            (*priority_cache)->disable_safe_renegotiation = 1;


hooks/post-receive
-- 
GNU gnutls