[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_9_10-68-g03249cd

[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=03249cd537c0b5697af8781b088dee412a80d908

The branch, gnutls_2_10_x has been updated
       via  03249cd537c0b5697af8781b088dee412a80d908 (commit)
      from  1ac2d2d55d84116c0e440caad3501efd2eaf5e54 (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 03249cd537c0b5697af8781b088dee412a80d908
Author: Simon Josefsson <address@hidden>
Date:   Mon Jun 7 15:07:29 2010 +0200

    Add new self test srn7.c.

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

Summary of changes:
 tests/safe-renegotiation/Makefile.am        |    2 +-
 tests/safe-renegotiation/README             |    5 +++++
 tests/safe-renegotiation/{srn0.c => srn7.c} |   12 +++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)
 copy tests/safe-renegotiation/{srn0.c => srn7.c} (95%)

diff --git a/tests/safe-renegotiation/Makefile.am 
b/tests/safe-renegotiation/Makefile.am
index 2411192..a63911c 100644
--- a/tests/safe-renegotiation/Makefile.am
+++ b/tests/safe-renegotiation/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
 AM_LDFLAGS = -no-install
 LDADD = ../../lib/libgnutls.la $(LTLIBGCRYPT) $(LIBSOCKET)
 
-ctests = srn0 srn1 srn2 srn3 srn4 srn5 srn6
+ctests = srn0 srn1 srn2 srn3 srn4 srn5 srn6 srn7
 
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
diff --git a/tests/safe-renegotiation/README b/tests/safe-renegotiation/README
index 81ca851..14c4406 100644
--- a/tests/safe-renegotiation/README
+++ b/tests/safe-renegotiation/README
@@ -42,3 +42,8 @@ srn6.c:
  This tests that a server with a permissive policy
  (%UNSAFE_RENEGOTIATION) is able to handshake and rehandshake with a
  client with no support for the extension.
+
+srn7.c:
+
+ This tests that clients and servers in %SAFE_RENEGOTIATION mode are
+ able to handshake and rehandshake.
diff --git a/tests/safe-renegotiation/srn0.c b/tests/safe-renegotiation/srn7.c
similarity index 95%
copy from tests/safe-renegotiation/srn0.c
copy to tests/safe-renegotiation/srn7.c
index 0d7e4bb..bd8141f 100644
--- a/tests/safe-renegotiation/srn0.c
+++ b/tests/safe-renegotiation/srn7.c
@@ -20,12 +20,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Code based on ../mini-x509-rehandshake.c.
+/* Code based on ../srn0.c.
  *
- * This tests that the safe renegotiation extension is negotiated
- * properly by default on initial connections and on rehandshaked
- * connections.  Consequently, it also verifies that rehandshaked
- * connections work with the extension enabled.
+ * This tests that clients and servers in %SAFE_RENEGOTIATION mode are
+ * able to handshake and rehandshake.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -185,7 +183,7 @@ main (int argc, char *argv[])
                                       GNUTLS_X509_FMT_PEM);
   gnutls_init (&server, GNUTLS_SERVER);
   gnutls_credentials_set (server, GNUTLS_CRD_CERTIFICATE, serverx509cred);
-  gnutls_priority_set_direct (server, "NORMAL", NULL);
+  gnutls_priority_set_direct (server, "NORMAL:%SAFE_RENEGOTIATION", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
 
@@ -193,7 +191,7 @@ main (int argc, char *argv[])
   gnutls_certificate_allocate_credentials (&clientx509cred);
   gnutls_init (&client, GNUTLS_CLIENT);
   gnutls_credentials_set (client, GNUTLS_CRD_CERTIFICATE, clientx509cred);
-  gnutls_priority_set_direct (client, "NORMAL", NULL);
+  gnutls_priority_set_direct (client, "NORMAL:%SAFE_RENEGOTIATION", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
 


hooks/post-receive
-- 
GNU gnutls