You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/04/01 22:20:57 UTC
cvs commit: apr-util/crypto apr_md5.c
jorton 2004/04/01 12:20:57
Modified: . Tag: APU_0_9_BRANCH CHANGES
crypto Tag: APU_0_9_BRANCH apr_md5.c
Log:
* crypto/apr_sha1.c (apr_validate_password): Restore support for SHA1
passwords.
PR: 17343
Revision Changes Path
No revision
No revision
1.117.2.6 +9 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.117.2.5
retrieving revision 1.117.2.6
diff -w -d -u -r1.117.2.5 -r1.117.2.6
--- CHANGES 22 Mar 2004 00:58:51 -0000 1.117.2.5
+++ CHANGES 1 Apr 2004 20:20:57 -0000 1.117.2.6
@@ -1,7 +1,16 @@
Changes with APR-util 0.9.5
+ *) Restore support for SHA1 passwords in apr_validate_password.
+ PR 17343. [Joe Orton]
+
+ *) Fix DESTDIR install for bundled expat library. PR 14076
+ [David S. Madole <david madole.net>]
+
*) Fix occasional crash in apr_rmm_realloc(). PR 22915.
[Jay Shrauner <shrauner inktomi.com>]
+
+ *) Fix apr_dbm_exists() for sdbm when sizeof(int) != sizeof(size_t).
+ [Joe Orton]
*) The whole codebase was relicensed and is now available under
the Apache License, Version 2.0 (http://www.apache.org/licenses).
No revision
No revision
1.7.2.2 +4 -0 apr-util/crypto/apr_md5.c
Index: apr_md5.c
===================================================================
RCS file: /home/cvs/apr-util/crypto/apr_md5.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -w -d -u -r1.7.2.1 -r1.7.2.2
--- apr_md5.c 26 Feb 2004 22:03:46 -0000 1.7.2.1
+++ apr_md5.c 1 Apr 2004 20:20:57 -0000 1.7.2.2
@@ -58,6 +58,7 @@
*/
#include "apr_strings.h"
#include "apr_md5.h"
+#include "apr_sha1.h" /* needed by apr_password_validate */
#include "apr_lib.h"
#include "apu_config.h"
@@ -682,6 +683,9 @@
* The hash was created using our custom algorithm.
*/
apr_md5_encode(passwd, hash, sample, sizeof(sample));
+ }
+ else if (!strncmp(hash, APR_SHA1PW_ID, APR_SHA1PW_IDLEN)) {
+ apr_sha1_base64(passwd, strlen(passwd), sample);
}
else {
/*