CVS gsasl/lib/digest-md5

[gsasl-commit]

Update of /home/cvs/gsasl/lib/digest-md5
In directory dopio:/tmp/cvs-serv4828

Modified Files:
        session.c server.c client.c 
Log Message:
Fix encode/decode.


--- /home/cvs/gsasl/lib/digest-md5/session.c    2004/10/13 16:23:29     1.3
+++ /home/cvs/gsasl/lib/digest-md5/session.c    2004/11/19 01:41:50     1.4
@@ -93,6 +93,14 @@
 
       free (hash);
     }
+  else
+    {
+      *output_len = input_len;
+      *output = malloc (input_len);
+      if (!*output)
+       return GSASL_MALLOC_ERROR;
+      memcpy (*output, input, input_len);
+    }
 
   return GSASL_OK;
 }
@@ -164,6 +172,14 @@
 
       free (hash);
     }
+  else
+    {
+      *output_len = input_len;
+      *output = malloc (input_len);
+      if (!*output)
+       return GSASL_MALLOC_ERROR;
+      memcpy (*output, input, input_len);
+    }
 
 
   return GSASL_OK;
--- /home/cvs/gsasl/lib/digest-md5/server.c     2004/11/01 00:00:01     1.11
+++ /home/cvs/gsasl/lib/digest-md5/server.c     2004/11/19 01:41:50     1.12
@@ -776,23 +776,12 @@
   _Gsasl_digest_md5_server_state *state = mech_data;
   int res;
 
-  if (state && state->step == 3)
-    {
-      res = digest_md5_encode (sctx, input, input_len, output, output_len,
-                              state->qop, state->sendseqnum, state->kis);
-      if (res != GSASL_OK)
-       return res;
-
-      state->sendseqnum++;
-    }
-  else
-    {
-      *output_len = input_len;
-      *output = malloc (input_len);
-      if (!*output)
-       return GSASL_MALLOC_ERROR;
-      memcpy (*output, input, input_len);
-    }
+  res = digest_md5_encode (sctx, input, input_len, output, output_len,
+                          state->qop, state->sendseqnum, state->kis);
+  if (res != GSASL_OK)
+    return res;
+
+  state->sendseqnum++;
 
   return GSASL_OK;
 }
@@ -807,23 +796,12 @@
   _Gsasl_digest_md5_server_state *state = mech_data;
   int res;
 
-  if (state && state->step == 3)
-    {
-      res = digest_md5_decode (sctx, input, input_len, output, output_len,
-                              state->qop, state->readseqnum, state->kic);
-      if (res != GSASL_OK)
-       return res;
-
-      state->readseqnum++;
-    }
-  else
-    {
-      *output_len = input_len;
-      *output = malloc (input_len);
-      if (!*output)
-       return GSASL_MALLOC_ERROR;
-      memcpy (*output, input, input_len);
-    }
+  res = digest_md5_decode (sctx, input, input_len, output, output_len,
+                          state->qop, state->readseqnum, state->kic);
+  if (res != GSASL_OK)
+    return res;
+
+  state->readseqnum++;
 
   return GSASL_OK;
 }
--- /home/cvs/gsasl/lib/digest-md5/client.c     2004/10/31 23:59:12     1.10
+++ /home/cvs/gsasl/lib/digest-md5/client.c     2004/11/19 01:41:50     1.11
@@ -835,23 +835,12 @@
   _Gsasl_digest_md5_client_state *state = mech_data;
   int res;
 
-  if (state && state->step == 3)
-    {
-      res = digest_md5_encode (sctx, input, input_len, output, output_len,
-                              state->qop, state->sendseqnum, state->kic);
-      if (res != GSASL_OK)
-       return res;
-
-      state->sendseqnum++;
-    }
-  else
-    {
-      *output_len = input_len;
-      *output = malloc (input_len);
-      if (!*output)
-       return GSASL_MALLOC_ERROR;
-      memcpy (*output, input, input_len);
-    }
+  res = digest_md5_encode (sctx, input, input_len, output, output_len,
+                          state->qop, state->sendseqnum, state->kic);
+  if (res != GSASL_OK)
+    return res;
+
+  state->sendseqnum++;
 
   return GSASL_OK;
 }
@@ -866,23 +855,12 @@
   _Gsasl_digest_md5_client_state *state = mech_data;
   int res;
 
-  if (state && state->step == 3)
-    {
-      res = digest_md5_decode (sctx, input, input_len, output, output_len,
-                              state->qop, state->readseqnum, state->kis);
-      if (res != GSASL_OK)
-       return res;
-
-      state->readseqnum++;
-    }
-  else
-    {
-      *output_len = input_len;
-      *output = malloc (input_len);
-      if (!*output)
-       return GSASL_MALLOC_ERROR;
-      memcpy (*output, input, input_len);
-    }
+  res = digest_md5_decode (sctx, input, input_len, output, output_len,
+                          state->qop, state->readseqnum, state->kis);
+  if (res != GSASL_OK)
+    return res;
+
+  state->readseqnum++;
 
   return GSASL_OK;
 }