CVS gsasl/lib/anonymous

[gsasl-commit]

Update of /home/cvs/gsasl/lib/anonymous
In directory dopio:/tmp/cvs-serv31080/lib/anonymous

Modified Files:
        anonymous.h client.c server.c 
Log Message:
Cleanup.


--- /home/cvs/gsasl/lib/anonymous/anonymous.h   2004/09/18 00:58:35     1.4
+++ /home/cvs/gsasl/lib/anonymous/anonymous.h   2004/09/18 16:17:32     1.5
@@ -34,8 +34,6 @@
                                         const char *input,
                                         size_t input_len,
                                         char **output, size_t * output_len);
-extern int _gsasl_anonymous_client_finish (Gsasl_session_ctx * sctx,
-                                          void *mech_data);
 
 extern int _gsasl_anonymous_server_start (Gsasl_session_ctx * sctx,
                                          void **mech_data);
@@ -43,7 +41,5 @@
                                         void *mech_data,
                                         const char *input, size_t input_len,
                                         char **output, size_t * output_len);
-extern int _gsasl_anonymous_server_finish (Gsasl_session_ctx * sctx,
-                                          void *mech_data);
 
 #endif /* _ANONYMOUS_H */
--- /home/cvs/gsasl/lib/anonymous/client.c      2004/09/18 16:13:03     1.1
+++ /home/cvs/gsasl/lib/anonymous/client.c      2004/09/18 16:17:32     1.2
@@ -25,16 +25,6 @@
 int
 _gsasl_anonymous_client_start (Gsasl_session_ctx * sctx, void **mech_data)
 {
-  int *step;
-
-  step = (int *) malloc (sizeof (*step));
-  if (step == NULL)
-    return GSASL_MALLOC_ERROR;
-
-  *step = 0;
-
-  *mech_data = step;
-
   return GSASL_OK;
 }
 
@@ -44,12 +34,8 @@
                              const char *input, size_t input_len,
                              char **output, size_t * output_len)
 {
-  int *step = mech_data;
   const char *p;
 
-  if (*step > 0)
-    return GSASL_OK;
-
   p = gsasl_property_get (sctx, GSASL_CLIENT_ANONYMOUS);
   if (!p)
     return GSASL_NO_ANONYMOUS_TOKEN;
@@ -59,17 +45,5 @@
     return GSASL_MALLOC_ERROR;
   *output_len = strlen (p);
 
-  (*step)++;
-
-  return GSASL_OK;
-}
-
-int
-_gsasl_anonymous_client_finish (Gsasl_session_ctx * sctx, void *mech_data)
-{
-  int *step = mech_data;
-
-  free (step);
-
   return GSASL_OK;
 }
--- /home/cvs/gsasl/lib/anonymous/server.c      2004/09/18 16:13:03     1.1
+++ /home/cvs/gsasl/lib/anonymous/server.c      2004/09/18 16:17:32     1.2
@@ -22,24 +22,9 @@
 
 #include "anonymous.h"
 
-struct _Gsasl_anonymous_server_state
-{
-  int step;
-};
-
 int
 _gsasl_anonymous_server_start (Gsasl_session_ctx * sctx, void **mech_data)
 {
-  struct _Gsasl_anonymous_server_state *state;
-
-  state = malloc (sizeof (*state));
-  if (state == NULL)
-    return GSASL_MALLOC_ERROR;
-
-  state->step = 0;
-
-  *mech_data = state;
-
   return GSASL_OK;
 }
 
@@ -49,52 +34,21 @@
                              const char *input, size_t input_len,
                              char **output, size_t * output_len)
 {
-  struct _Gsasl_anonymous_server_state *state = mech_data;
   char *token;
-  int res;
 
   *output = NULL;
   *output_len = 0;
 
-  switch (state->step)
-    {
-    case 0:
-      state->step++;
-      if (input_len == 0)
-       return GSASL_NEEDS_MORE;
-      /* fall through */
-
-    case 1:
-      if (input_len == 0)
-       return GSASL_MECHANISM_PARSE_ERROR;
-
-      token = malloc (input_len + 1);
-      if (token == NULL)
-       return GSASL_MALLOC_ERROR;
-      memcpy (token, input, input_len);
-      token[input_len] = '\0';
-      gsasl_property_set (sctx, GSASL_SERVER_ANONYMOUS, token);
-      free (token);
-
-      res = gsasl_callback (sctx, GSASL_SERVER_ANONYMOUS);
-
-      state->step++;
-      break;
-
-    default:
-      res = GSASL_MECHANISM_CALLED_TOO_MANY_TIMES;
-      break;
-    }
+  if (input_len == 0)
+    return GSASL_NEEDS_MORE;
 
-  return res;
-}
-
-int
-_gsasl_anonymous_server_finish (Gsasl_session_ctx * sctx, void *mech_data)
-{
-  struct _Gsasl_anonymous_server_state *state = mech_data;
-
-  free (state);
+  token = malloc (input_len + 1);
+  if (token == NULL)
+    return GSASL_MALLOC_ERROR;
+  memcpy (token, input, input_len);
+  token[input_len] = '\0';
+  gsasl_property_set (sctx, GSASL_SERVER_ANONYMOUS, token);
+  free (token);
 
-  return GSASL_OK;
+  return gsasl_callback (sctx, GSASL_SERVER_ANONYMOUS);
 }