[SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-47-g7a37718

[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 gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=7a3771853ec5fda506f89da259ec62d0c0dd389d

The branch, master has been updated
       via  7a3771853ec5fda506f89da259ec62d0c0dd389d (commit)
       via  37f3a257b7f11660088bcb789f28b919987118ad (commit)
      from  e67b1385bdc67ee9bbb072dd204fe6e018d34363 (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 7a3771853ec5fda506f89da259ec62d0c0dd389d
Author: Simon Josefsson <address@hidden>
Date:   Wed Mar 17 08:04:06 2010 +0100

    Try both client first and server first.

commit 37f3a257b7f11660088bcb789f28b919987118ad
Author: Simon Josefsson <address@hidden>
Date:   Wed Mar 17 08:02:08 2010 +0100

    Try both client first and server first.

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

Summary of changes:
 tests/gs2-krb5.c |   15 +++++++++------
 tests/gssapi.c   |   13 +++++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/tests/gs2-krb5.c b/tests/gs2-krb5.c
index 13e1acc..4241f17 100644
--- a/tests/gs2-krb5.c
+++ b/tests/gs2-krb5.c
@@ -26,6 +26,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include "utils.h"
 
@@ -117,6 +118,8 @@ doit (void)
 
   for (i = 0; i < 5; i++)
     {
+      bool server_first = (i % 2) == 0;
+
       rc = gsasl_server_start (ctx, "GS2-KRB5", &server);
       if (rc != GSASL_OK)
        {
@@ -132,11 +135,9 @@ doit (void)
 
       do
        {
-         res1 = gsasl_step64 (client, s1, &s2);
+         res1 = gsasl_step64 (server_first ? server : client, s1, &s2);
          if (s1 == NULL && res1 == GSASL_OK)
            fail("gsasl_step64 direct success?\n");
-         if (s1 == NULL && strcmp (s2, "") == 0)
-           fail("gsasl_step64 empty initial output?\n");
          if (s1)
            {
              gsasl_free (s1);
@@ -150,9 +151,10 @@ doit (void)
            }
 
          if (debug)
-           printf ("C: %s [%c]\n", s2, res1 == GSASL_OK ? 'O' : 'N');
+           printf ("%c: %s [%c]\n", server_first ? 'S' : 'C',
+                   s2, res1 == GSASL_OK ? 'O' : 'N');
 
-         res2 = gsasl_step64 (server, s2, &s1);
+         res2 = gsasl_step64 (server_first ? client : server, s2, &s1);
          gsasl_free (s2);
          if (res2 != GSASL_OK && res2 != GSASL_NEEDS_MORE)
            {
@@ -162,7 +164,8 @@ doit (void)
            }
 
          if (debug)
-           printf ("S: %s [%c]\n", s1, res2 == GSASL_OK ? 'O' : 'N');
+           printf ("%c: %s [%c]\n", server_first ? 'C' : 'S',
+                   s1, res2 == GSASL_OK ? 'O' : 'N');
        }
       while (res1 != GSASL_OK || res2 != GSASL_OK);
 
diff --git a/tests/gssapi.c b/tests/gssapi.c
index 0030f4d..0ea717f 100644
--- a/tests/gssapi.c
+++ b/tests/gssapi.c
@@ -26,6 +26,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include "utils.h"
 
@@ -113,6 +114,8 @@ doit (void)
 
   for (i = 0; i < 5; i++)
     {
+      bool server_first = (i % 2) == 0;
+
       rc = gsasl_server_start (ctx, "GSSAPI", &server);
       if (rc != GSASL_OK)
        {
@@ -128,7 +131,7 @@ doit (void)
 
       do
        {
-         res1 = gsasl_step64 (server, s1, &s2);
+         res1 = gsasl_step64 (server_first ? server : client, s1, &s2);
          if (s1)
            {
              gsasl_free (s1);
@@ -142,12 +145,13 @@ doit (void)
            }
 
          if (debug)
-           printf ("S: %s [%c]\n", s2, res1 == GSASL_OK ? 'O' : 'N');
+           printf ("%c: %s [%c]\n", server_first ? 'S' : 'C',
+                   s2, res1 == GSASL_OK ? 'O' : 'N');
 
          if (res1 == GSASL_OK && strcmp (s2, "") == 0)
            break;
 
-         res2 = gsasl_step64 (client, s2, &s1);
+         res2 = gsasl_step64 (server_first ? client : server, s2, &s1);
          gsasl_free (s2);
          if (res2 != GSASL_OK && res2 != GSASL_NEEDS_MORE)
            {
@@ -157,7 +161,8 @@ doit (void)
            }
 
          if (debug)
-           printf ("C: %s [%c]\n", s1, res2 == GSASL_OK ? 'O' : 'N');
+           printf ("%c: %s [%c]\n", server_first ? 'C' : 'S',
+                   s1, res2 == GSASL_OK ? 'O' : 'N');
        }
       while (res1 != GSASL_OK || res2 != GSASL_OK);
 


hooks/post-receive
-- 
GNU gsasl