--------------------- PatchSet 4117 Date: 2002/05/05 16:47:19 Author: serassio Branch: nt-2_5 Tag: (none) Log: Added digest authentication schema and null store module to WIN32 project Members: port/win32/.cvsignore:1.1->1.1.4.1 port/win32/squid.dsw:1.1.2.12->1.1.2.13 port/win32/squid_mswin.mak:1.1.2.4->1.1.2.5 port/win32/update.cmd:1.1.2.7->1.1.2.8 port/win32/libdigest/.cvsignore:1.1->1.1.4.1 port/win32/libdigest/libdigest.dsp:1.1->1.1.4.1 port/win32/libnull/.cvsignore:1.1->1.1.4.1 port/win32/libnull/libnull.dsp:1.1->1.1.4.1 src/auth/digest/auth_digest.c:1.12.6.1->1.12.6.1.4.1 --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/.cvsignore Wed Feb 14 00:58:25 2007 @@ -0,0 +1,3 @@ +.cvsignore +Debug +Release Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -r1.1.2.12 -r1.1.2.13 --- squid/port/win32/squid.dsw 3 May 2002 18:39:56 -0000 1.1.2.12 +++ squid/port/win32/squid.dsw 5 May 2002 16:47:19 -0000 1.1.2.13 @@ -186,6 +186,18 @@ ############################################################################### +Project: "libdigest"=".\libdigest\libdigest.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgnuregex"=".\libgnuregex\libgnuregex.dsp" - Package Owner=<4> Package=<5> @@ -261,6 +273,18 @@ ############################################################################### +Project: "libnull"=".\libnull\libnull.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libsnmp"=".\libsnmp\libsnmp.dsp" - Package Owner=<4> Package=<5> @@ -395,6 +419,12 @@ Begin Project Dependency Project_Dep_Name libheap End Project Dependency + Begin Project Dependency + Project_Dep_Name libdigest + End Project Dependency + Begin Project Dependency + Project_Dep_Name libnull + End Project Dependency }}} ############################################################################### Index: squid/port/win32/squid_mswin.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid_mswin.mak,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/port/win32/squid_mswin.mak 27 Mar 2002 21:01:10 -0000 1.1.2.4 +++ squid/port/win32/squid_mswin.mak 5 May 2002 16:47:19 -0000 1.1.2.5 @@ -41,9 +41,9 @@ DEFAULT_MIB_PATH = $(datadir)/mib.txt DEFAULT_HOSTS = none -AUTH_MODULES = basic ntlm +AUTH_MODULES = basic ntlm digest REPL_POLICIES = lru heap -STORE_MODULES = ufs awin32 +STORE_MODULES = ufs awin32 null cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre gawk -f $(srcdir)\cf_gen_defines <$(srcdir)\cf.data.pre >$(srcdir)\cf_gen_defines.h Index: squid/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/update.cmd,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid/port/win32/update.cmd 26 Apr 2002 20:31:45 -0000 1.1.2.7 +++ squid/port/win32/update.cmd 5 May 2002 16:47:19 -0000 1.1.2.8 @@ -11,7 +11,7 @@ copy %0\..\ntlm_win32_auth\%1\ntlm_win32_auth.exe %2\libexec\ntlm_win32_auth.exe copy %0\..\ldap_auth\%1\ldap_auth.exe %2\libexec\ldap_auth.exe rem copy %0\..\..\contrib\htpasswd\%1\htpasswd.exe %2\htpasswd.exe -copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.exe +copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.cgi rem copy %0\..\..\contrib\chpasswd\%1\chpasswd.exe %2\cgi-bin\chpasswd.cgi copy %0\..\..\..\src\squid.conf.default %2\etc\squid.conf.default copy %0\..\..\..\src\mime.conf.default %2\etc\mime.conf.default --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/libdigest/.cvsignore Wed Feb 14 00:58:25 2007 @@ -0,0 +1,3 @@ +.cvsignore +Debug +Release --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/libdigest/libdigest.dsp Wed Feb 14 00:58:25 2007 @@ -0,0 +1,100 @@ +# Microsoft Developer Studio Project File - Name="libdigest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libdigest - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libdigest.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libdigest.mak" CFG="libdigest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libdigest - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libdigest - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libdigest - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libdigest - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libdigest - Win32 Release" +# Name "libdigest - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\digest\auth_digest.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\auth\digest\auth_digest.h +# End Source File +# End Group +# End Target +# End Project --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/libnull/.cvsignore Wed Feb 14 00:58:25 2007 @@ -0,0 +1,3 @@ +.cvsignore +Debug +Release --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/libnull/libnull.dsp Wed Feb 14 00:58:25 2007 @@ -0,0 +1,96 @@ +# Microsoft Developer Studio Project File - Name="libnull" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libnull - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libnull.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libnull.mak" CFG="libnull - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libnull - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libnull - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libnull - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libnull - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libnull - Win32 Release" +# Name "libnull - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\fs\null\store_null.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project Index: squid/src/auth/digest/auth_digest.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/digest/auth_digest.c,v retrieving revision 1.12.6.1 retrieving revision 1.12.6.1.4.1 diff -u -r1.12.6.1 -r1.12.6.1.4.1 --- squid/src/auth/digest/auth_digest.c 13 Jan 2002 03:23:54 -0000 1.12.6.1 +++ squid/src/auth/digest/auth_digest.c 5 May 2002 16:47:20 -0000 1.12.6.1.4.1 @@ -174,7 +174,7 @@ newnonce->flags.valid = 1; newnonce->noncedata.self = newnonce; newnonce->noncedata.creationtime = current_time.tv_sec; - newnonce->noncedata.randomdata = random(); + newnonce->noncedata.randomdata = squid_random(); authDigestNonceEncode(newnonce); /* @@ -183,7 +183,7 @@ */ while ((temp = authenticateDigestNonceFindNonce(newnonce->hash.key))) { /* create a new nonce */ - newnonce->noncedata.randomdata = random(); + newnonce->noncedata.randomdata = squid_random(); authDigestNonceEncode(newnonce); } hash_join(digest_nonce_cache, &newnonce->hash);