[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_9_10-67-g1ac2d2d

[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=1ac2d2d55d84116c0e440caad3501efd2eaf5e54

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

    Add new self test srn6.c

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

Summary of changes:
 tests/safe-renegotiation/Makefile.am        |    2 +-
 tests/safe-renegotiation/README             |    6 ++++++
 tests/safe-renegotiation/{srn5.c => srn6.c} |   12 ++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)
 copy tests/safe-renegotiation/{srn5.c => srn6.c} (97%)

diff --git a/tests/safe-renegotiation/Makefile.am 
b/tests/safe-renegotiation/Makefile.am
index e175c78..2411192 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
+ctests = srn0 srn1 srn2 srn3 srn4 srn5 srn6
 
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
diff --git a/tests/safe-renegotiation/README b/tests/safe-renegotiation/README
index 91a6db9..81ca851 100644
--- a/tests/safe-renegotiation/README
+++ b/tests/safe-renegotiation/README
@@ -36,3 +36,9 @@ srn5.c:
  This tests that a client with a permissive policy
  (%UNSAFE_RENEGOTIATION) is able to handshake and rehandshake with a
  server with no support for the extension.
+
+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.
diff --git a/tests/safe-renegotiation/srn5.c b/tests/safe-renegotiation/srn6.c
similarity index 97%
copy from tests/safe-renegotiation/srn5.c
copy to tests/safe-renegotiation/srn6.c
index 3da57ad..f677b83 100644
--- a/tests/safe-renegotiation/srn5.c
+++ b/tests/safe-renegotiation/srn6.c
@@ -20,11 +20,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Code based on ./srn0.c.
+/* Code based on ./srn5.c.
  *
- * This tests that a client with a permissive policy
+ * This tests that a server with a permissive policy
  * (%UNSAFE_RENEGOTIATION) is able to handshake and rehandshake with a
- * server with no support for the extension.
+ * client with no support for the extension.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -184,8 +184,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:%DISABLE_SAFE_RENEGOTIATION",
-                             NULL);
+  gnutls_priority_set_direct (server, "NORMAL:%UNSAFE_RENEGOTIATION", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
 
@@ -193,7 +192,8 @@ 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:%UNSAFE_RENEGOTIATION", NULL);
+  gnutls_priority_set_direct (client, "NORMAL:%DISABLE_SAFE_RENEGOTIATION",
+                             NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
 


hooks/post-receive
-- 
GNU gnutls