gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS gsasl/lib/digest-md5


From: gsasl-commit
Subject: CVS gsasl/lib/digest-md5
Date: Mon, 27 Dec 2004 03:12:59 +0100

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

Modified Files:
        client.c digesthmac.c digesthmac.h free.c free.h getsubopt.c 
        mechinfo.c parser.c parser.h printer.c printer.h server.c 
        session.c test-parser.c tokens.h validate.c validate.h 
Log Message:
Indent.

--- /home/cvs/gsasl/lib/digest-md5/client.c     2004/12/19 20:15:10     1.25
+++ /home/cvs/gsasl/lib/digest-md5/client.c     2004/12/27 02:12:59     1.26
@@ -207,8 +207,7 @@
                              state->response.digesturi,
                              0,
                              state->response.cipher,
-                             state->kic, state->kis,
-                             state->kcc, state->kcs);
+                             state->kic, state->kis, state->kcc, state->kcs);
        if (rc)
          return GSASL_CRYPTO_ERROR;
 
@@ -235,7 +234,8 @@
                               state->response.cnonce, state->response.qop,
                               state->response.authzid,
                               state->response.digesturi, 1,
-                              state->response.cipher, NULL, NULL, NULL, NULL);
+                              state->response.cipher, NULL, NULL, NULL,
+                              NULL);
        if (res != GSASL_OK)
          break;
 
--- /home/cvs/gsasl/lib/digest-md5/digesthmac.c 2004/12/19 18:03:28     1.3
+++ /home/cvs/gsasl/lib/digest-md5/digesthmac.c 2004/12/27 02:12:59     1.4
@@ -181,7 +181,7 @@
              DERIVE_CLIENT_CONFIDENTIALITY_KEY_STRING_LEN);
 
       rc = gc_md5 (tmp, n + DERIVE_CLIENT_CONFIDENTIALITY_KEY_STRING_LEN,
-                     hash2);
+                  hash2);
       if (rc)
        return rc;
 
@@ -206,7 +206,7 @@
              DERIVE_SERVER_CONFIDENTIALITY_KEY_STRING_LEN);
 
       rc = gc_md5 (tmp, n + DERIVE_SERVER_CONFIDENTIALITY_KEY_STRING_LEN,
-                     hash2);
+                  hash2);
       if (rc)
        return rc;
 
--- /home/cvs/gsasl/lib/digest-md5/digesthmac.h 2004/12/19 19:02:36     1.4
+++ /home/cvs/gsasl/lib/digest-md5/digesthmac.h 2004/12/27 02:12:59     1.5
@@ -41,8 +41,9 @@
    computed keys on output.  Returns 0 on success. */
 extern int digest_md5_hmac (char *output, char secret[DIGEST_MD5_LENGTH],
                            char *nonce, unsigned long nc, char *cnonce,
-                           digest_md5_qop qop, char *authzid, char *digesturi,
-                           int rspauth, digest_md5_cipher cipher,
-                           char *kic, char *kis, char *kcc, char *kcs);
+                           digest_md5_qop qop, char *authzid,
+                           char *digesturi, int rspauth,
+                           digest_md5_cipher cipher, char *kic, char *kis,
+                           char *kcc, char *kcs);
 
 #endif /* DIGEST_MD5_DIGESTHMAC_H */
--- /home/cvs/gsasl/lib/digest-md5/free.c       2004/12/19 18:58:50     1.3
+++ /home/cvs/gsasl/lib/digest-md5/free.c       2004/12/27 02:12:59     1.4
@@ -33,13 +33,13 @@
 #include <string.h>
 
 void
-digest_md5_free_challenge (digest_md5_challenge *c)
+digest_md5_free_challenge (digest_md5_challenge * c)
 {
   size_t i;
 
   for (i = 0; i < c->nrealms; i++)
     free (c->realms[i]);
-  if  (c->realms)
+  if (c->realms)
     free (c->realms);
   if (c->nonce)
     free (c->nonce);
@@ -48,7 +48,7 @@
 }
 
 void
-digest_md5_free_response (digest_md5_response *r)
+digest_md5_free_response (digest_md5_response * r)
 {
   if (r->username)
     free (r->username);
@@ -67,7 +67,7 @@
 }
 
 void
-digest_md5_free_finish (digest_md5_finish *f)
+digest_md5_free_finish (digest_md5_finish * f)
 {
   memset (f, 0, sizeof (*f));
 }
--- /home/cvs/gsasl/lib/digest-md5/free.h       2004/12/19 05:36:12     1.1
+++ /home/cvs/gsasl/lib/digest-md5/free.h       2004/12/27 02:12:59     1.2
@@ -26,10 +26,10 @@
 /* Get token types. */
 #include "tokens.h"
 
-extern void digest_md5_free_challenge (digest_md5_challenge *c);
+extern void digest_md5_free_challenge (digest_md5_challenge * c);
 
-extern void digest_md5_free_response (digest_md5_response *r);
+extern void digest_md5_free_response (digest_md5_response * r);
 
-extern void digest_md5_free_finish (digest_md5_finish *f);
+extern void digest_md5_free_finish (digest_md5_finish * f);
 
 #endif /* DIGEST_MD5_FREE_H */
--- /home/cvs/gsasl/lib/digest-md5/getsubopt.c  2004/12/19 02:13:18     1.5
+++ /home/cvs/gsasl/lib/digest-md5/getsubopt.c  2004/12/27 02:12:59     1.6
@@ -44,8 +44,7 @@
    This function is NOT identical to standard getsubopt! */
 int
 digest_md5_getsubopt (char **optionp,
-                     const char *const *tokens,
-                     char **valuep)
+                     const char *const *tokens, char **valuep)
 {
   char *endp, *vstart;
   int cnt;
--- /home/cvs/gsasl/lib/digest-md5/mechinfo.c   2004/09/24 14:07:37     1.1
+++ /home/cvs/gsasl/lib/digest-md5/mechinfo.c   2004/12/27 02:12:59     1.2
@@ -30,61 +30,62 @@
 Gsasl_mechanism gsasl_digest_md5_mechanism = {
   GSASL_DIGEST_MD5_NAME,
   {
-    NULL,
-    NULL,
+   NULL,
+   NULL,
 #ifdef USE_CLIENT
-    _gsasl_digest_md5_client_start,
+   _gsasl_digest_md5_client_start,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_CLIENT
-    _gsasl_digest_md5_client_step,
+   _gsasl_digest_md5_client_step,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_CLIENT
-    _gsasl_digest_md5_client_finish,
+   _gsasl_digest_md5_client_finish,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_CLIENT
-    _gsasl_digest_md5_client_encode,
+   _gsasl_digest_md5_client_encode,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_CLIENT
-    _gsasl_digest_md5_client_decode
+   _gsasl_digest_md5_client_decode
 #else
-    NULL
+   NULL
 #endif
-  },
+   }
+  ,
   {
-    NULL,
-    NULL,
+   NULL,
+   NULL,
 #ifdef USE_SERVER
-    _gsasl_digest_md5_server_start,
+   _gsasl_digest_md5_server_start,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_SERVER
-    _gsasl_digest_md5_server_step,
+   _gsasl_digest_md5_server_step,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_SERVER
-    _gsasl_digest_md5_server_finish,
+   _gsasl_digest_md5_server_finish,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_SERVER
-    _gsasl_digest_md5_server_encode,
+   _gsasl_digest_md5_server_encode,
 #else
-    NULL,
+   NULL,
 #endif
 #ifdef USE_SERVER
-    _gsasl_digest_md5_server_decode
+   _gsasl_digest_md5_server_decode
 #else
-    NULL
+   NULL
 #endif
-  }
+   }
 };
--- /home/cvs/gsasl/lib/digest-md5/parser.c     2004/12/27 01:56:07     1.16
+++ /home/cvs/gsasl/lib/digest-md5/parser.c     2004/12/27 02:12:59     1.17
@@ -40,17 +40,17 @@
 #define DEFAULT_ALGORITHM "md5-sess"
 
 enum
-  {
-    /* the order must match the following struct */
-    CHALLENGE_REALM = 0,
-    CHALLENGE_NONCE,
-    CHALLENGE_QOP,
-    CHALLENGE_STALE,
-    CHALLENGE_MAXBUF,
-    CHALLENGE_CHARSET,
-    CHALLENGE_ALGORITHM,
-    CHALLENGE_CIPHER
-  };
+{
+  /* the order must match the following struct */
+  CHALLENGE_REALM = 0,
+  CHALLENGE_NONCE,
+  CHALLENGE_QOP,
+  CHALLENGE_STALE,
+  CHALLENGE_MAXBUF,
+  CHALLENGE_CHARSET,
+  CHALLENGE_ALGORITHM,
+  CHALLENGE_CIPHER
+};
 
 static const char *const digest_challenge_opts[] = {
   /* the order must match the previous enum */
@@ -67,12 +67,12 @@
 
 /* qop-value         = "auth" | "auth-int" | "auth-conf" | qop-token */
 enum
-  {
-    /* the order must match the following struct */
-    QOP_AUTH = 0,
-    QOP_AUTH_INT,
-    QOP_AUTH_CONF
-  };
+{
+  /* the order must match the following struct */
+  QOP_AUTH = 0,
+  QOP_AUTH_INT,
+  QOP_AUTH_CONF
+};
 
 static const char *const qop_opts[] = {
   /* the order must match the previous enum */
@@ -87,15 +87,15 @@
  *                     ;; "des" and "3des" ciphers are obsolete.
  */
 enum
-  {
-    /* the order must match the following struct */
-    CIPHER_DES = 0,
-    CIPHER_3DES,
-    CIPHER_RC4,
-    CIPHER_RC4_40,
-    CIPHER_RC4_56,
-    CIPHER_AES_CBC
-  };
+{
+  /* the order must match the following struct */
+  CIPHER_DES = 0,
+  CIPHER_3DES,
+  CIPHER_RC4,
+  CIPHER_RC4_40,
+  CIPHER_RC4_56,
+  CIPHER_AES_CBC
+};
 
 static const char *const cipher_opts[] = {
   /* the order must match the previous enum */
@@ -109,7 +109,7 @@
 };
 
 static int
-parse_challenge (char *challenge, digest_md5_challenge *out)
+parse_challenge (char *challenge, digest_md5_challenge * out)
 {
   int done_algorithm = 0;
   int disable_qop_auth_conf = 0;
@@ -313,21 +313,21 @@
 }
 
 enum
-  {
-    /* the order must match the following struct */
-    RESPONSE_USERNAME = 0,
-    RESPONSE_REALM,
-    RESPONSE_NONCE,
-    RESPONSE_CNONCE,
-    RESPONSE_NC,
-    RESPONSE_QOP,
-    RESPONSE_DIGEST_URI,
-    RESPONSE_RESPONSE,
-    RESPONSE_MAXBUF,
-    RESPONSE_CHARSET,
-    RESPONSE_CIPHER,
-    RESPONSE_AUTHZID
-  };
+{
+  /* the order must match the following struct */
+  RESPONSE_USERNAME = 0,
+  RESPONSE_REALM,
+  RESPONSE_NONCE,
+  RESPONSE_CNONCE,
+  RESPONSE_NC,
+  RESPONSE_QOP,
+  RESPONSE_DIGEST_URI,
+  RESPONSE_RESPONSE,
+  RESPONSE_MAXBUF,
+  RESPONSE_CHARSET,
+  RESPONSE_CIPHER,
+  RESPONSE_AUTHZID
+};
 
 static const char *const digest_response_opts[] = {
   /* the order must match the previous enum */
@@ -347,7 +347,7 @@
 };
 
 static int
-parse_response (char *response, digest_md5_response *out)
+parse_response (char *response, digest_md5_response * out)
 {
   char *value;
 
@@ -519,10 +519,10 @@
 }
 
 enum
-  {
-    /* the order must match the following struct */
-    RESPONSEAUTH_RSPAUTH = 0
-  };
+{
+  /* the order must match the following struct */
+  RESPONSEAUTH_RSPAUTH = 0
+};
 
 static const char *const digest_responseauth_opts[] = {
   /* the order must match the previous enum */
@@ -531,7 +531,7 @@
 };
 
 static int
-parse_finish (char *finish, digest_md5_finish *out)
+parse_finish (char *finish, digest_md5_finish * out)
 {
   char *value;
 
@@ -567,7 +567,7 @@
 
 int
 digest_md5_parse_challenge (const char *challenge, size_t len,
-                           digest_md5_challenge *out)
+                           digest_md5_challenge * out)
 {
   size_t inlen = len ? len : strlen (challenge);
   char *subopts = malloc (inlen + 1);
@@ -588,7 +588,7 @@
 
 int
 digest_md5_parse_response (const char *response, size_t len,
-                          digest_md5_response *out)
+                          digest_md5_response * out)
 {
   size_t inlen = len ? len : strlen (response);
   char *subopts = malloc (inlen + 1);
@@ -609,7 +609,7 @@
 
 int
 digest_md5_parse_finish (const char *finish, size_t len,
-                        digest_md5_finish *out)
+                        digest_md5_finish * out)
 {
   size_t inlen = len ? len : strlen (finish);
   char *subopts = malloc (inlen + 1);
--- /home/cvs/gsasl/lib/digest-md5/parser.h     2004/12/19 08:23:38     1.6
+++ /home/cvs/gsasl/lib/digest-md5/parser.h     2004/12/27 02:12:59     1.7
@@ -27,16 +27,15 @@
 #include "tokens.h"
 
 extern int digest_md5_getsubopt (char **optionp,
-                                const char *const *tokens,
-                                char **valuep);
+                                const char *const *tokens, char **valuep);
 
 extern int digest_md5_parse_challenge (const char *challenge, size_t len,
-                                      digest_md5_challenge *out);
+                                      digest_md5_challenge * out);
 
 extern int digest_md5_parse_response (const char *response, size_t len,
-                                     digest_md5_response *out);
+                                     digest_md5_response * out);
 
 extern int digest_md5_parse_finish (const char *finish, size_t len,
-                                   digest_md5_finish *out);
+                                   digest_md5_finish * out);
 
 #endif /* DIGEST_MD5_PARSER_H */
--- /home/cvs/gsasl/lib/digest-md5/printer.c    2004/12/19 07:37:53     1.4
+++ /home/cvs/gsasl/lib/digest-md5/printer.c    2004/12/27 02:12:59     1.5
@@ -40,7 +40,7 @@
    such as "foo=bar, , , bar=foo".  It is valid, but look ugly. */
 
 char *
-digest_md5_print_challenge (digest_md5_challenge *c)
+digest_md5_print_challenge (digest_md5_challenge * c)
 {
   char *out = NULL;
   char *realm = NULL, *maxbuf = NULL;
@@ -88,7 +88,7 @@
                c->ciphers ? "\"" : "") < 0)
     out = NULL;
 
- end:
+end:
   if (realm)
     free (realm);
   if (maxbuf)
@@ -99,7 +99,7 @@
 }
 
 char *
-digest_md5_print_response (digest_md5_response *r)
+digest_md5_print_response (digest_md5_response * r)
 {
   char *out = NULL;
   const char *qop = NULL;
@@ -158,11 +158,10 @@
                r->utf8 ? "charset=utf-8" : "",
                cipher,
                r->authzid ? "authzid=\"" : "",
-               r->authzid ? r->authzid : "",
-               r->authzid ? "\"" : "") < 0)
+               r->authzid ? r->authzid : "", r->authzid ? "\"" : "") < 0)
     out = NULL;
 
- end:
+end:
   if (maxbuf)
     free (maxbuf);
 
@@ -170,7 +169,7 @@
 }
 
 char *
-digest_md5_print_finish (digest_md5_finish *finish)
+digest_md5_print_finish (digest_md5_finish * finish)
 {
   char *out;
 
--- /home/cvs/gsasl/lib/digest-md5/printer.h    2004/12/19 04:32:08     1.2
+++ /home/cvs/gsasl/lib/digest-md5/printer.h    2004/12/27 02:12:59     1.3
@@ -26,10 +26,10 @@
 /* Get token types. */
 #include "tokens.h"
 
-extern char *digest_md5_print_challenge (digest_md5_challenge *challenge);
+extern char *digest_md5_print_challenge (digest_md5_challenge * challenge);
 
-extern char *digest_md5_print_response (digest_md5_response *response);
+extern char *digest_md5_print_response (digest_md5_response * response);
 
-extern char *digest_md5_print_finish (digest_md5_finish *out);
+extern char *digest_md5_print_finish (digest_md5_finish * out);
 
 #endif /* DIGEST_MD5_PRINTER_H */
--- /home/cvs/gsasl/lib/digest-md5/server.c     2004/12/22 19:22:05     1.25
+++ /home/cvs/gsasl/lib/digest-md5/server.c     2004/12/27 02:12:59     1.26
@@ -144,8 +144,7 @@
       break;
 
     case 1:
-      if (digest_md5_parse_response (input, input_len,
-                                    &state->response) < 0)
+      if (digest_md5_parse_response (input, input_len, &state->response) < 0)
        return GSASL_MECHANISM_PARSE_ERROR;
 
       /* Make sure response is consistent with challenge. */
@@ -160,7 +159,7 @@
       /* FIXME: qop, cipher, maxbuf. */
 
       /* Compute secret.  TODO: Add callback to retrieve hashed
-        secret. */
+         secret. */
       {
        const char *c;
        char *tmp, *tmp2;
@@ -191,8 +190,7 @@
                              state->response.cnonce, state->response.qop,
                              state->response.authzid,
                              state->response.digesturi, 0,
-                             state->response.cipher,
-                             NULL, NULL, NULL, NULL);
+                             state->response.cipher, NULL, NULL, NULL, NULL);
        if (rc)
          return GSASL_AUTHENTICATION_ERROR;
 
@@ -257,7 +255,8 @@
   int res;
 
   res = digest_md5_encode (input, input_len, output, output_len,
-                          state->response.qop, state->sendseqnum, state->kis);
+                          state->response.qop, state->sendseqnum,
+                          state->kis);
   if (res)
     return res == -2 ? GSASL_NEEDS_MORE : GSASL_INTEGRITY_ERROR;
 
@@ -280,7 +279,8 @@
   int res;
 
   res = digest_md5_decode (input, input_len, output, output_len,
-                          state->response.qop, state->readseqnum, state->kic);
+                          state->response.qop, state->readseqnum,
+                          state->kic);
   if (res)
     return res == -2 ? GSASL_NEEDS_MORE : GSASL_INTEGRITY_ERROR;
 
--- /home/cvs/gsasl/lib/digest-md5/session.c    2004/12/19 20:07:16     1.7
+++ /home/cvs/gsasl/lib/digest-md5/session.c    2004/12/27 02:12:59     1.8
@@ -48,8 +48,7 @@
 digest_md5_encode (const char *input, size_t input_len,
                   char **output, size_t * output_len,
                   digest_md5_qop qop,
-                  unsigned long sendseqnum,
-                  char key[DIGEST_MD5_LENGTH])
+                  unsigned long sendseqnum, char key[DIGEST_MD5_LENGTH])
 {
   int res;
 
@@ -74,8 +73,7 @@
       memcpy (seqnumin + MAC_SEQNUM_LEN, input, input_len);
 
       res = gc_hmac_md5 (key, MD5LEN,
-                        seqnumin, MAC_SEQNUM_LEN + input_len,
-                        hash);
+                        seqnumin, MAC_SEQNUM_LEN + input_len, hash);
       free (seqnumin);
       if (res)
        return -1;
@@ -124,8 +122,7 @@
 digest_md5_decode (const char *input, size_t input_len,
                   char **output, size_t * output_len,
                   digest_md5_qop qop,
-                  unsigned long readseqnum,
-                  char key[DIGEST_MD5_LENGTH])
+                  unsigned long readseqnum, char key[DIGEST_MD5_LENGTH])
 {
   if (qop & DIGEST_MD5_QOP_AUTH_CONF)
     {
@@ -162,14 +159,15 @@
       memcpy (seqnumin + SASL_INTEGRITY_PREFIX_LENGTH,
              input + MAC_DATA_LEN, len);
 
-      res = gc_hmac_md5 (key, MD5LEN, seqnumin, MAC_SEQNUM_LEN + len,
-                        hash);
+      res = gc_hmac_md5 (key, MD5LEN, seqnumin, MAC_SEQNUM_LEN + len, hash);
       free (seqnumin);
       if (res)
        return -1;
 
-      if (memcmp (hash, input + input_len - MAC_SEQNUM_LEN - MAC_MSG_TYPE_LEN -
-                 MAC_HMAC_LEN, MAC_HMAC_LEN) == 0
+      if (memcmp
+         (hash,
+          input + input_len - MAC_SEQNUM_LEN - MAC_MSG_TYPE_LEN -
+          MAC_HMAC_LEN, MAC_HMAC_LEN) == 0
          && memcmp (MAC_MSG_TYPE,
                     input + input_len - MAC_SEQNUM_LEN - MAC_MSG_TYPE_LEN,
                     MAC_MSG_TYPE_LEN) == 0
--- /home/cvs/gsasl/lib/digest-md5/test-parser.c        2004/12/19 17:45:09     
1.9
+++ /home/cvs/gsasl/lib/digest-md5/test-parser.c        2004/12/27 02:12:59     
1.10
@@ -175,9 +175,9 @@
 
   memset (buf16, 'Q', 16);
 
-  rc = digest_md5_hmac (buf32, buf16, "nonce", 1, "cnonce", 
DIGEST_MD5_QOP_AUTH,
-                       "authzid", "digesturi", 1, 0,
-                       NULL, NULL, NULL, NULL);
+  rc =
+    digest_md5_hmac (buf32, buf16, "nonce", 1, "cnonce", DIGEST_MD5_QOP_AUTH,
+                    "authzid", "digesturi", 1, 0, NULL, NULL, NULL, NULL);
   if (rc != 0)
     abort ();
   buf32[32] = '\0';
@@ -185,9 +185,9 @@
     abort ();
   printf ("digest: `%s': PASS\n", buf32);
 
-  rc = digest_md5_hmac (buf32, buf16, "nonce", 1, "cnonce", 
DIGEST_MD5_QOP_AUTH,
-                       "authzid", "digesturi", 0, 0,
-                       NULL, NULL, NULL, NULL);
+  rc =
+    digest_md5_hmac (buf32, buf16, "nonce", 1, "cnonce", DIGEST_MD5_QOP_AUTH,
+                    "authzid", "digesturi", 0, 0, NULL, NULL, NULL, NULL);
   if (rc != 0)
     abort ();
   buf32[32] = '\0';
--- /home/cvs/gsasl/lib/digest-md5/tokens.h     2004/12/19 18:58:50     1.6
+++ /home/cvs/gsasl/lib/digest-md5/tokens.h     2004/12/27 02:12:59     1.7
@@ -31,23 +31,23 @@
 
 /* Quality of Protection types. */
 enum digest_md5_qop
-  {
-    DIGEST_MD5_QOP_AUTH = 1,
-    DIGEST_MD5_QOP_AUTH_INT = 2,
-    DIGEST_MD5_QOP_AUTH_CONF = 4
-  };
+{
+  DIGEST_MD5_QOP_AUTH = 1,
+  DIGEST_MD5_QOP_AUTH_INT = 2,
+  DIGEST_MD5_QOP_AUTH_CONF = 4
+};
 typedef enum digest_md5_qop digest_md5_qop;
 
 /* Cipher types. */
 enum digest_md5_cipher
-  {
-    DIGEST_MD5_CIPHER_DES = 1,
-    DIGEST_MD5_CIPHER_3DES = 2,
-    DIGEST_MD5_CIPHER_RC4 = 4,
-    DIGEST_MD5_CIPHER_RC4_40 = 8,
-    DIGEST_MD5_CIPHER_RC4_56 = 16,
-    DIGEST_MD5_CIPHER_AES_CBC = 32
-  };
+{
+  DIGEST_MD5_CIPHER_DES = 1,
+  DIGEST_MD5_CIPHER_3DES = 2,
+  DIGEST_MD5_CIPHER_RC4 = 4,
+  DIGEST_MD5_CIPHER_RC4_40 = 8,
+  DIGEST_MD5_CIPHER_RC4_56 = 16,
+  DIGEST_MD5_CIPHER_AES_CBC = 32
+};
 typedef enum digest_md5_cipher digest_md5_cipher;
 
 /*
@@ -79,7 +79,8 @@
  * auth-param        = token "=" ( token | quoted-string )
  *
  */
-struct digest_md5_challenge {
+struct digest_md5_challenge
+{
   size_t nrealms;
   char **realms;
   char *nonce;
@@ -122,7 +123,8 @@
  *     authzid-value    = qdstr-val
  *
  */
-struct digest_md5_response {
+struct digest_md5_response
+{
   char *username;
   char *realm;
   char *nonce;
@@ -141,7 +143,8 @@
 /*
  * response-auth = "rspauth" "=" response-value
  */
-struct digest_md5_finish {
+struct digest_md5_finish
+{
   char rspauth[DIGEST_MD5_RESPONSE_LENGTH + 1];
 };
 typedef struct digest_md5_finish digest_md5_finish;
--- /home/cvs/gsasl/lib/digest-md5/validate.c   2004/12/20 17:14:44     1.6
+++ /home/cvs/gsasl/lib/digest-md5/validate.c   2004/12/27 02:12:59     1.7
@@ -31,7 +31,7 @@
 #include <string.h>
 
 int
-digest_md5_validate_challenge (digest_md5_challenge *c)
+digest_md5_validate_challenge (digest_md5_challenge * c)
 {
   /* This directive is required and MUST appear exactly once; if
      not present, or if multiple instances are present, the
@@ -50,7 +50,7 @@
 }
 
 int
-digest_md5_validate_response (digest_md5_response *r)
+digest_md5_validate_response (digest_md5_response * r)
 {
   /* This directive is required and MUST be present exactly
      once; otherwise, authentication fails. */
@@ -100,7 +100,7 @@
 }
 
 int
-digest_md5_validate_finish (digest_md5_finish *f)
+digest_md5_validate_finish (digest_md5_finish * f)
 {
   if (!f->rspauth)
     return -1;
@@ -109,7 +109,7 @@
 }
 
 int
-digest_md5_validate (digest_md5_challenge *c, digest_md5_response *r)
+digest_md5_validate (digest_md5_challenge * c, digest_md5_response * r)
 {
   if (!c->nonce || !r->nonce)
     return -1;
--- /home/cvs/gsasl/lib/digest-md5/validate.h   2004/12/19 05:35:49     1.2
+++ /home/cvs/gsasl/lib/digest-md5/validate.h   2004/12/27 02:12:59     1.3
@@ -26,13 +26,13 @@
 /* Get token types. */
 #include "tokens.h"
 
-extern int digest_md5_validate_challenge (digest_md5_challenge *c);
+extern int digest_md5_validate_challenge (digest_md5_challenge * c);
 
-extern int digest_md5_validate_response (digest_md5_response *r);
+extern int digest_md5_validate_response (digest_md5_response * r);
 
-extern int digest_md5_validate_finish (digest_md5_finish *f);
+extern int digest_md5_validate_finish (digest_md5_finish * f);
 
-extern int digest_md5_validate (digest_md5_challenge *c,
-                               digest_md5_response *r);
+extern int digest_md5_validate (digest_md5_challenge * c,
+                               digest_md5_response * r);
 
 #endif /* DIGEST_MD5_VALIDATE_H */





reply via email to

[Prev in Thread] Current Thread [Next in Thread]