Mirror 1.1.x MD5 fix.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@2021 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index c2958aa248d831826b4330deffb6d6ea2f669b01..b022d9333135625c35367c477a784866d2ec6887 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.13
 
+       - The httpMD5Final() function didn't put a colon between
+         the password and nonce strings.
        - The pstops filter did not default to Binary data for
          "%%BeginData:".
        - The pstops filter did not stop processing when a line

diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index bb87b776fe054d876f22981a7520e0fe4ddb1239..5c775cab2c1d22704547d1b49c8f979184f017dd 100644 (file)
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5passwd.c,v 1.5.2.1 2002/01/02 18:04:29 mike Exp $"
+ * "$Id: md5passwd.c,v 1.5.2.2 2002/01/05 01:30:07 mike Exp $"
  *
  *   MD5 password support for the Common UNIX Printing System (CUPS).
  *
@@ -103,7 +103,7 @@ httpMD5Final(const char *nonce,             /* I - Server nonce value */
   * request...
   */
 
-  snprintf(line, sizeof(line), "%s%s:%s", md5, nonce, a2);
+  snprintf(line, sizeof(line), "%s:%s:%s", md5, nonce, a2);
 
   md5_init(&state);
   md5_append(&state, (md5_byte_t *)line, strlen(line));
@@ -144,5 +144,5 @@ httpMD5String(const md5_byte_t *sum,        /* I - MD5 sum data */
 
 
 /*
- * End of "$Id: md5passwd.c,v 1.5.2.1 2002/01/02 18:04:29 mike Exp $".
+ * End of "$Id: md5passwd.c,v 1.5.2.2 2002/01/05 01:30:07 mike Exp $".
  */