cvs commit: apache-1.3/src/support ab.c
dirkx 99/08/08 04:45:20
Modified:src/ap Makefile.tmpl ap_sha1.c
src/include ap.h ap_sha1.h httpd.h
src/main http_protocol.c util.c
src/modules/proxy proxy_ftp.c
src/support ab.c
Log:
Collating various peoples patches on base64, md5 and sha1
which sanitize the uuencoding used in various places a
little bit; and getting rid of all the warnings.
What is left now is moving ap_sha1.h and ap_md5.h into
ap.h OR #including them there and modularizing the ap.h
file. Secondly it might be nice to swap the base64-ish
encoding used in apache's its own MD5 passwords to the
uu-encoded one to get rid of those routines. But that
would break compatibility betwen the 1.x series.
Let's hope this is all for now.
Modified Files:
ap/Makefile.tmpl ap/ap_checkpass.c ap/ap_md5c.c ap/ap_sha1.c
include/ap.h include/ap_sha1.h include/httpd.h
main/http_protocol.c main/util.c modules/proxy/proxy_ftp.c
support/ab.c
Revision ChangesPath
1.34 +1 -1 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /x3/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.tmpl 1999/08/02 10:13:44 1.33
+++ Makefile.tmpl 1999/08/08 11:45:15 1.34
@@ -6,7 +6,7 @@
LIB=libap.a
OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o
ap_signal.o \
- ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o
+ ap_slack.o ap_snprintf.o ap_sha1.o ap_checkpass.o ap_base64.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
1.4 +85 -102 apache-1.3/src/ap/ap_sha1.c
Index: ap_sha1.c
===
RCS file: /x3/home/cvs/apache-1.3/src/ap/ap_sha1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_sha1.c 1999/08/05 20:04:01 1.3
+++ ap_sha1.c 1999/08/08 11:45:15 1.4
@@ -6,7 +6,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
+ *notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
@@ -70,10 +70,10 @@
* will always generate the same hash, making it easier
* to break since the search space is smaller.
*
- * See also the documentation in support/SHA1 as to hints on how to
+ * See also the documentation in support/SHA1 as to hints on how to
* migrate an existing netscape installation and other supplied utitlites.
*
- * This software also makes use of the following components:
+ * This software also makes use of the following components:
*
* NIST Secure Hash Algorithm
* heavily modified by Uwe Hollerbach [EMAIL PROTECTED] edu
@@ -86,15 +86,15 @@
*
* Metamail's copyright is:
* Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- * Permission to use, copy, modify, and distribute this material
- * for any purpose and without fee is hereby granted, provided
- * that the above copyright notice and this permission notice
- * appear in all copies, and that the name of Bellcore not be
- * used in advertising or publicity pertaining to this
- * material without the specific, prior written permission
- * of an authorized representative of Bellcore. BELLCORE
- * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED AS IS,
+ * Permission to use, copy, modify, and distribute this material
+ * for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice
+ * appear in all copies, and that the name of Bellcore not be
+ * used in advertising or publicity pertaining to this
+ * material without the specific, prior written permission
+ * of an authorized representative of Bellcore. BELLCORE
+ * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+ * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED AS IS,
* WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
*/
@@ -133,30 +133,13 @@
temp = ROT32(A,5) + f##n(B,C,D) + E + W[i] + CONST##n; \
E = D; D = C; C = ROT32(B,30); B = A; A = temp
-typedef unsigned char AP_BYTE; /* an 8-bit quantity */
-typedef unsigned long AP_LONG; /* a 32-bit quantity */
-
#define SHA_BLOCKSIZE 64
#define SHA_DIGESTSIZE 20
-
-typedef struct {
-AP_LONG digest[5]; /* message digest */
-AP_LONG count_lo,
cvs commit: apache-1.3/src/support ab.c
dirkx 99/08/08 04:47:47 Modified:src/support ab.c Log: Hmm, cvs does not always remove files. Sorry. Modified Files: ab.c Revision ChangesPath 1.28 +1 -1 apache-1.3/src/support/ab.c Index: ab.c === RCS file: /x3/home/cvs/apache-1.3/src/support/ab.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ab.c 1999/08/08 11:45:20 1.27 +++ ab.c 1999/08/08 11:47:47 1.28 @@ -123,7 +123,7 @@ #define ap_select select #else/* (!)NO_APACHE_INCLUDES */ #include ap_config.h -#include ap_base64.h +#include ap.h #ifdef CHARSET_EBCDIC #include ebcdic.h #endif
cvs commit: apache-1.3/src/main http_main.c
coar99/08/08 05:05:15
Modified:src/main http_main.c
Log:
Fix a miniscule compilation warning.
Revision ChangesPath
1.468 +1 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- http_main.c 1999/08/05 20:04:04 1.467
+++ http_main.c 1999/08/08 12:05:13 1.468
@@ -6648,6 +6648,7 @@
* Force ap_validate_password() into the image so that modules like
* mod_auth can use it even if they're dynamically loaded.
*/
+void suck_in_ap_validate_password(void);
void suck_in_ap_validate_password(void)
{
ap_validate_password(a, b);
cvs commit: apache-1.3/src/main http_main.c
dirkx 99/08/08 06:31:51
Modified:src/main http_main.c
Log:
Warning on *BSD, Solaris (uid_t - int) on printf.
Revision ChangesPath
1.469 +2 -2 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /x3/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- http_main.c 1999/08/08 12:05:13 1.468
+++ http_main.c 1999/08/08 13:31:50 1.469
@@ -3700,7 +3700,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change to uid: %d, ap_user_id);
+ setuid: unable to change to uid: %d, (int) ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4885,7 +4885,7 @@
/* Only try to switch if we're running as root */
if (!geteuid() setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change to uid: %d, ap_user_id);
+ setuid: unable to change to uid: %d, (int)
ap_user_id);
exit(1);
}
#endif
cvs commit: apache-1.3/src/ap ap_base64.c
dirkx 99/08/08 09:12:58
Added: src/ap ap_base64.c
Log:
disk full
Revision ChangesPath
1.1 apache-1.3/src/ap/ap_base64.c
Index: ap_base64.c
===
/*
* Copyright (c) 1995-1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* 4. The names Apache Server and Apache Group must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group and was originally based
* on public domain software written at the National Center for
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
* For more information on the Apache Group and the Apache HTTP server
* project, please see http://www.apache.org/.
*
*/
/* * base64 encoder/decoder. Origianly part of main/util.c
* but moved here so that support/ab and ap_sha1.c could
* use it. This mean (re)moving the ap_palloc()s. And adding
* ugly 'len' functions. Which is quite a nasty cost.
*/
#include string.h
#include ap_config.h
#include ap.h
#ifdef CHARSET_EBCDIC
#include ebcdic.h
#endif/* CHARSET_EBCDIC */
/* ck but it's fast and const should make it shared text page. */
static const unsigned char pr2six[256] =
{
#ifndef CHARSET_EBCDIC
/* ASCII table */
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64, 64, 0, 1, 2, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 64, 64, 64, 64, 64, 64, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
#else /*CHARSET_EBCDIC*/
/* EBCDIC table */
64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
Re: cvs commit: apache-1.3/src/ap ap_base64.c
Eh. I am not quite sure why I only now see this one going in. And why it says 'disk full'. But I supped a comletely fresh copy of CVS and CVS certainly seems as correct as it should be. Dw. On 8 Aug 1999 [EMAIL PROTECTED] wrote: dirkx 99/08/08 09:12:58 Added: src/ap ap_base64.c Log: disk full Revision ChangesPath 1.1 apache-1.3/src/ap/ap_base64.c Index: ap_base64.c === ... /* * base64 encoder/decoder. Origianly part of main/util.c * but moved here so that support/ab and ap_sha1.c could * use it. This mean (re)moving the ap_palloc()s. And adding * ugly 'len' functions. Which is quite a nasty cost. */ ..
cvs commit: apache-1.3/src/ap ap_base64.c
rse 99/08/08 10:38:47 Modified:src/ap ap_base64.c Log: typos while poking around Revision ChangesPath 1.2 +1 -1 apache-1.3/src/ap/ap_base64.c Index: ap_base64.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_base64.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_base64.c 1999/08/08 16:12:58 1.1 +++ ap_base64.c 1999/08/08 17:38:45 1.2 @@ -55,7 +55,7 @@ * */ -/* * base64 encoder/decoder. Origianly part of main/util.c +/* base64 encoder/decoder. Originally part of main/util.c * but moved here so that support/ab and ap_sha1.c could * use it. This mean (re)moving the ap_palloc()s. And adding * ugly 'len' functions. Which is quite a nasty cost.
cvs commit: apache-1.3/src/ap ap_checkpass.c
ronald 99/08/08 10:57:30 Modified:src/ap ap_checkpass.c Log: removed unneccesary #include Revision ChangesPath 1.2 +0 -3 apache-1.3/src/ap/ap_checkpass.c Index: ap_checkpass.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_checkpass.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_checkpass.c1999/08/02 10:13:44 1.1 +++ ap_checkpass.c1999/08/08 17:57:29 1.2 @@ -63,9 +63,6 @@ #include ap_md5.h #include ap_sha1.h #include ap.h -#ifdef CHARSET_EBCDIC -#include ebcdic.h -#endif /*CHARSET_EBCDIC*/ #if HAVE_CRYPT_H #include crypt.h #endif
cvs commit: apache-1.3/src/include ap_sha1.h
ronald 99/08/08 10:58:36 Modified:src/ap ap_sha1.c src/include ap_sha1.h Log: removed obsolete reference to base64 code from metamail Revision ChangesPath 1.5 +2 -18 apache-1.3/src/ap/ap_sha1.c Index: ap_sha1.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_sha1.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ap_sha1.c 1999/08/08 11:45:15 1.4 +++ ap_sha1.c 1999/08/08 17:58:34 1.5 @@ -53,7 +53,7 @@ * For more information on the Apache Group and the Apache HTTP server * project, please see http://www.apache.org/. * - * The only exported function: + * The exported function: * *ap_sha1_base64(const char *clear, int len, char *out); * @@ -73,29 +73,13 @@ * See also the documentation in support/SHA1 as to hints on how to * migrate an existing netscape installation and other supplied utitlites. * - * This software also makes use of the following components: + * This software also makes use of the following component: * * NIST Secure Hash Algorithm * heavily modified by Uwe Hollerbach [EMAIL PROTECTED] edu * from Peter C. Gutmann's implementation as found in * Applied Cryptography by Bruce Schneier * This code is hereby placed in the public domain - * - * MIME Base 64 encoding based on src/metamail/codes.c in metamail, - * available at: ftp://thumper.bellcore.com/pub/nsb/ - * - * Metamail's copyright is: - * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) - * Permission to use, copy, modify, and distribute this material - * for any purpose and without fee is hereby granted, provided - * that the above copyright notice and this permission notice - * appear in all copies, and that the name of Bellcore not be - * used in advertising or publicity pertaining to this - * material without the specific, prior written permission - * of an authorized representative of Bellcore. BELLCORE - * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY - * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED AS IS, - * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ #include string.h 1.5 +0 -17 apache-1.3/src/include/ap_sha1.h Index: ap_sha1.h === RCS file: /home/cvs/apache-1.3/src/include/ap_sha1.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ap_sha1.h 1999/08/08 11:45:16 1.4 +++ ap_sha1.h 1999/08/08 17:58:35 1.5 @@ -58,23 +58,6 @@ * from Peter C. Gutmann's implementation as found in * Applied Cryptography by Bruce Schneier * This code is hereby placed in the public domain - * - * MIME Base 64 encoding based on src/metamail/codes.c in metamail, - * available at: ftp://thumper.bellcore.com/pub/nsb/ - * - * Metamail's copyright is: - * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) - * - * Permission to use, copy, modify, and distribute this material - * for any purpose and without fee is hereby granted, provided - * that the above copyright notice and this permission notice - * appear in all copies, and that the name of Bellcore not be - * used in advertising or publicity pertaining to this - * material without the specific, prior written permission - * of an authorized representative of Bellcore. BELLCORE - * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY - * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED AS IS, - * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ #ifndef APACHE_SHA1_H
cvs commit: apache-1.3/src/ap Makefile.tmpl
ronald 99/08/08 10:59:29 Modified:src/ap Makefile.tmpl Log: added dependency for ap_sha1.o Revision ChangesPath 1.35 +2 -0 apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Makefile.tmpl 1999/08/08 11:45:15 1.34 +++ Makefile.tmpl 1999/08/08 17:59:28 1.35 @@ -59,6 +59,8 @@ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \ $(INCDIR)/ap.h +ap_sha1.o: ap_sha1.c $(INCDIR)/ap_config.h $(INCDIR)/ap_sha1.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
cvs commit: apache-1.3/src/ap ap_checkpass.c
randy 99/08/08 11:18:13
Modified:src/ap ap_checkpass.c
Log:
Fix a warning in Win32.
Revision ChangesPath
1.3 +2 -3 apache-1.3/src/ap/ap_checkpass.c
Index: ap_checkpass.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_checkpass.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_checkpass.c1999/08/08 17:57:29 1.2
+++ ap_checkpass.c1999/08/08 18:18:12 1.3
@@ -78,8 +78,8 @@
API_EXPORT(char *) ap_validate_password(const char *passwd, const char *hash)
{
char sample[120];
-char *crypt_pw;
+
/* FreeBSD style MD5 string
*/
if (!strncmp(hash, apr1_id, strlen(apr1_id))) {
@@ -104,8 +104,7 @@
*/
ap_cpystrn(sample, passwd, sizeof(sample) - 1);
#else
- crypt_pw = crypt(passwd, hash);
- ap_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
+ ap_cpystrn(sample, (char *)crypt(passwd, hash), sizeof(sample) - 1);
#endif
}
return (strcmp(sample, hash) == 0) ? NULL : password mismatch;
cvs commit: apache-1.3/src/ap ap_sha1.c
randy 99/08/08 11:18:42
Modified:src/ap ap_sha1.c
Log:
Fix a warning on Win32.
Revision ChangesPath
1.6 +1 -1 apache-1.3/src/ap/ap_sha1.c
Index: ap_sha1.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_sha1.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ap_sha1.c 1999/08/08 17:58:34 1.5
+++ ap_sha1.c 1999/08/08 18:18:41 1.6
@@ -240,7 +240,7 @@
const unsigned char *buffer,
unsigned int count)
{
-int i;
+unsigned int i;
if ((sha_info-count_lo + ((AP_LONG) count 3)) sha_info-count_lo) {
++sha_info-count_hi;
cvs commit: apache-1.3/src/support htpasswd.dsp htpasswd.mak
randy 99/08/08 11:20:11
Modified:src/ap ap.dsp ap.mak
src/support htpasswd.dsp htpasswd.mak
Log:
Fix Makefiles for Win32 to accomodate abstraction of authentication API.
Revision ChangesPath
1.7 +4 -0 apache-1.3/src/ap/ap.dsp
Index: ap.dsp
===
RCS file: /home/cvs/apache-1.3/src/ap/ap.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.dsp1999/08/07 20:49:17 1.6
+++ ap.dsp1999/08/08 18:20:05 1.7
@@ -114,5 +114,9 @@
SOURCE=.\ap_checkpass.c
# End Source File
+# Begin Source File
+
+SOURCE=.\ap_base64.c
+# End Source File
# End Target
# End Project
1.7 +67 -26apache-1.3/src/ap/ap.mak
Index: ap.mak
===
RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.mak1999/08/07 20:34:09 1.6
+++ ap.mak1999/08/08 18:20:05 1.7
@@ -51,6 +51,7 @@
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
[EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_base64.obj
[EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -97,7 +98,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ap.bsc
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:$(OUTDIR)\ap.lib
LIB32_OBJS= \
@@ -108,6 +109,7 @@
$(INTDIR)\ap_slack.obj \
$(INTDIR)\ap_snprintf.obj \
$(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_base64.obj \
$(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
@@ -141,6 +143,7 @@
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
[EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_base64.obj
[EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -187,7 +190,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ap.bsc
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:$(OUTDIR)\ap.lib
LIB32_OBJS= \
@@ -198,6 +201,7 @@
$(INTDIR)\ap_slack.obj \
$(INTDIR)\ap_snprintf.obj \
$(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_base64.obj \
$(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
@@ -227,13 +231,13 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_CP=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_cpystrn.obj : $(SOURCE) $(DEP_CPP_AP_CP) $(INTDIR)
@@ -252,8 +256,8 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_cpystrn.obj : $(SOURCE) $(DEP_CPP_AP_CP) $(INTDIR)
@@ -272,12 +276,12 @@
..\os\win32\os.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_FN=\
..\include\ap_config_auto.h\
..\include\os.h\
-
+
$(INTDIR)\ap_fnmatch.obj : $(SOURCE) $(DEP_CPP_AP_FN) $(INTDIR)
@@ -290,7 +294,7 @@
..\include\fnmatch.h\
..\include\hsregex.h\
..\os\win32\os.h\
-
+
$(INTDIR)\ap_fnmatch.obj : $(SOURCE) $(DEP_CPP_AP_FN) $(INTDIR)
@@ -315,13 +319,13 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_SI=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_signal.obj : $(SOURCE) $(DEP_CPP_AP_SI) $(INTDIR)
@@ -340,8 +344,8 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_signal.obj : $(SOURCE) $(DEP_CPP_AP_SI) $(INTDIR)
@@ -366,14 +370,14 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_SL=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_slack.obj : $(SOURCE) $(DEP_CPP_AP_SL) $(INTDIR)
@@ -392,7 +396,7 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_slack.obj : $(SOURCE) $(DEP_CPP_AP_SL) $(INTDIR)
@@ -417,14 +421,14 @@
..\os\win32\readdir.h\
cvs commit: apache-apr/include apr_general.h apr_time.h
rbb 99/08/08 14:20:07
Modified:apr acconfig.h
apr/file_io/win32 file_io.dsp readwrite.c
apr/include apr_pools.h apr_win.h
apr/lib lib.dsp
apr/misc/win32 misc.def misc.dsp
apr/test ab_apr.c client.dsp server.dsp test.dsw testargs.c
testfile.c testfile.dsp testproc.dsp testsig.dsp
testsock.dsp testthread.dsp timetest.dsp
apr/time/win32 time.c time.def
include apr_general.h apr_time.h
Added: apr/misc/win32 getopt.c
apr/test ab_apr.dsp testarg.dsp
Log:
Make apr compile on NT again. Also get the testarg test working, and the
getopt stuff working on NT. :)
Revision ChangesPath
1.3 +1 -0 apache-apr/apr/acconfig.h
Index: acconfig.h
===
RCS file: /home/cvs/apache-apr/apr/acconfig.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acconfig.h1999/07/23 14:41:34 1.2
+++ acconfig.h1999/08/08 21:19:34 1.3
@@ -21,6 +21,7 @@
@BOTTOM@
#define API_EXPORT(type) type
#define API_EXPORT_NONSTD(type) type
+#define API_VAR_IMPORT extern
/* Make sure we have ssize_t defined to be somethine */
#undef ssize_t
1.2 +1 -1 apache-apr/apr/file_io/win32/file_io.dsp
Index: file_io.dsp
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/file_io.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_io.dsp 1999/06/03 19:43:44 1.1
+++ file_io.dsp 1999/08/08 21:19:35 1.2
@@ -68,7 +68,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D
_WINDOWS /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /I
..\..\..\include /D WIN32 /D _DEBUG /D _WINDOWS /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /I
..\..\..\include /D WIN32 /D _DEBUG /D _WINDOWS /FR /YX /FD /c
# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d _DEBUG
1.3 +1 -1 apache-apr/apr/file_io/win32/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/readwrite.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readwrite.c 1999/06/23 21:09:18 1.2
+++ readwrite.c 1999/08/08 21:19:36 1.3
@@ -60,7 +60,7 @@
#include apr_errno.h
#include windows.h
-ap_status_t ap_read(const struct file_t *thefile, void *buf, ap_ssize_t
*nbytes)
+ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
{
DWORD bread;
int lasterror;
1.6 +2 -0 apache-apr/apr/include/apr_pools.h
Index: apr_pools.h
===
RCS file: /home/cvs/apache-apr/apr/include/apr_pools.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_pools.h 1999/07/13 19:51:25 1.5
+++ apr_pools.h 1999/08/08 21:19:37 1.6
@@ -90,7 +90,9 @@
#include apr_lib.h
#include sys/types.h
+#ifdef HAVE_SYS_WAIT_H
#include sys/wait.h
+#endif
#include signal.h
struct process_chain {
1.9 +6 -1 apache-apr/apr/include/apr_win.h
Index: apr_win.h
===
RCS file: /home/cvs/apache-apr/apr/include/apr_win.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_win.h 1999/08/04 17:51:57 1.8
+++ apr_win.h 1999/08/08 21:19:38 1.9
@@ -61,6 +61,7 @@
#include winsock2.h
#include windows.h
#include sys\types.h
+#include stddef.h
#include stdio.h
#include time.h
@@ -103,11 +104,15 @@
typedef void (Sigfunc)(int);
#define __attribute__(__x)
-#define APR_INLINE
+#define SIZEOF_SHORT 2
+#define SIZEOF_INT 4
+#define SIZEOF_LONGLONG 8
+
#define API_EXPORT(x)x
#define API_EXPORT_NONSTD(x) x
#define API_THREAD_FUNC __stdcall
+#define API_VAR_IMPORT _declspec(dllimport)
#define strcasecmp(s1, s2) stricmp(s1, s2)
#define sleep(t) Sleep(t * 1000)
1.4 +4 -0 apache-apr/apr/lib/lib.dsp
Index: lib.dsp
===
RCS file: /home/cvs/apache-apr/apr/lib/lib.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lib.dsp 1999/06/02 19:38:01 1.3
+++ lib.dsp 1999/08/08 21:19:39
cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c Makefile.tmpl
ronald 99/08/08 15:34:25 Modified:src/modules/experimental Makefile.tmpl Added: src/modules/experimental mod_auth_digest.c Log: updated version of mod_digest; in experimental until further tested Revision ChangesPath 1.14 +9 -0 apache-1.3/src/modules/experimental/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.tmpl 1998/09/07 06:59:34 1.13 +++ Makefile.tmpl 1999/08/08 22:34:24 1.14 @@ -12,3 +12,12 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ $(INCDIR)/http_request.h $(INCDIR)/http_core.h +mod_digest.o: mod_digest.c $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ + $(INCDIR)/ap_md5.h 1.1 apache-1.3/src/modules/experimental/mod_auth_digest.c Index: mod_auth_digest.c === /* * Copyright (c) 1995-1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group and was originally based * on public domain software written at the National Center for * Supercomputing Applications, University of Illinois, Urbana-Champaign. * For more information on the Apache Group and the Apache HTTP server * project, please see http://www.apache.org/. * */ /* * mod_auth_digest: MD5 digest authentication * * Originally by Alexei Kosut [EMAIL PROTECTED] * Updated to RFC-2617 by Ronald Tschalär [EMAIL PROTECTED] * based on mod_auth, by Rob McCool and Robert S. Thau * * This module an updated version of modules/standard/mod_digest.c * However, it has not been extensively tested yet, and is therefore * currently marked experimental. Send problem reports to me * ([EMAIL PROTECTED]) * * Requires either /dev/random (or equivalent) or the truerand library, * available for instance from *
cvs commit: apache-1.3/htdocs/manual/mod mod_auth_digest.html index.html
ronald 99/08/08 15:37:17 Modified:src Configuration.tmpl htdocs/manual/mod index.html Added: htdocs/manual/mod mod_auth_digest.html Log: changes for new modules/experimental/mod_auth_digest Revision ChangesPath 1.118 +25 -5 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- Configuration.tmpl1999/06/22 15:33:10 1.117 +++ Configuration.tmpl1999/08/08 22:37:14 1.118 @@ -124,12 +124,12 @@ # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, -# SOCKS5, IRIXNIS, IRIXN32 and PARANOID. +# SOCKS5, IRIXNIS, IRIXN32, PARANOID, and DEV_RANDOM. # -# For all Rules, if set to yes, then Configure knows we want that -# capability and does what is required to add it in. If set to default -# then Configure makes a best guess; if set to anything else, or not -# present, then nothing is done. +# For all Rules except DEV_RANDOM, if set to yes, then Configure knows +# we want that capability and does what is required to add it in. If set +# to default then Configure makes a best guess; if set to anything +# else, or not present, then nothing is done. # # SOCKS4: # If SOCKS4 is set to 'yes', be sure that you add the socks library @@ -174,6 +174,19 @@ Rule PARANOID=no Rule EXPAT=default +# DEV_RANDOM: +# Note: this rule is only used when compiling mod_auth_digest. +# mod_auth_digest requires a cryptographically strong random seed for its +# random number generator. It knows two ways of getting this: 1) from +# a file or device (such as /dev/random), or 2) from the truerand +# library. If this rule is set to 'default' then Configure will choose +# to use /dev/random if it exists, else /dev/urandom if it exists, +# else the truerand library. To override this behaviour set DEV_RANDOM +# either to 'truerand' (to use the library) or to a device or file +# (e.g. '/dev/urandom'). If the truerand library is selected, Configure +# will assume -L/usr/local/lib -lrand. +Rule DEV_RANDOM=default + # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for # your platform), or are set incorrectly, you may override them here. @@ -308,6 +321,13 @@ ## and a common prefix, e.g., /~user , /usr/web/user , etc. AddModule modules/standard/mod_userdir.o + +## digest implements HTTP Digest Authentication rather than the less +## secure Basic Auth used by the other modules. This is an updated +## version of mod_digest, but it is not well tested and is therefore +## marked experimental + +# AddModule modules/experimental/mod_auth_digest.o ## The proxy module enables the server to act as a proxy for outside ## http and ftp services. It's not as complete as it could be yet. 1.28 +2 -0 apache-1.3/htdocs/manual/mod/index.html Index: index.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/index.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- index.html1999/06/22 00:51:23 1.27 +++ index.html1999/08/08 22:37:15 1.28 @@ -42,6 +42,8 @@ DDUser authentication using Berkeley DB files. DTA HREF=mod_auth_dbm.htmlmod_auth_dbm/A DDUser authentication using DBM files. +DTA HREF=mod_auth_digest.htmlmod_auth_digest/A +DDMD5 authentication (experimental) DTA HREF=mod_autoindex.htmlmod_autoindex/A DDAutomatic directory listings. DTA HREF=mod_browser.htmlmod_browser/A Apache 1.2.* only 1.1 apache-1.3/htdocs/manual/mod/mod_auth_digest.html Index: mod_auth_digest.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEApache module mod_auth_digest/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF !--#include virtual=header.html -- H1 ALIGN=CENTERModule mod_auth_digest/H1 This module is contained in the CODEmod_auth_digest.c/CODE file, and is not compiled in by default. It is only available in Apache 1.3.8 and later. It provides for user authentication using MD5 Digest Authentication. PNote this is an updated version of A HREF=mod_digest.htmlmod_digest/A. However, it has not been extensively tested and is therefore marked experimental. If you use this module, you must make sure to emnot/em use
cvs commit: apache-1.3/src Configuration.tmpl
ronald 99/08/08 15:45:11 Modified:src Configuration.tmpl Log: Aargh - forgot the note about needing the truerand library for mod_auth_digest Revision ChangesPath 1.119 +5 -1 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- Configuration.tmpl1999/08/08 22:37:14 1.118 +++ Configuration.tmpl1999/08/08 22:45:10 1.119 @@ -325,7 +325,11 @@ ## digest implements HTTP Digest Authentication rather than the less ## secure Basic Auth used by the other modules. This is an updated ## version of mod_digest, but it is not well tested and is therefore -## marked experimental +## marked experimental. +## Note: if you add this module in then you might also need the +## truerand library (available for example from +## ftp://research.att.com/dist/mab/librand.shar) - see the Rule +## DEV_RANDOM above for more info. # AddModule modules/experimental/mod_auth_digest.o
