--------------------- PatchSet 1249 Date: 2001/01/10 10:12:08 Author: rbcollins Branch: auth_digest Tag: (none) Log: added RFC 2617 copyright statements Members: include/rfc2617.h:1.1.2.2->1.1.2.3 lib/rfc2617.c:1.1.2.4->1.1.2.5 src/auth/digest/auth_digest.c:1.1.2.18->1.1.2.19 Index: squid/include/rfc2617.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/rfc2617.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/include/rfc2617.h 15 Dec 2000 23:47:41 -0000 1.1.2.2 +++ squid/include/rfc2617.h 10 Jan 2001 10:12:38 -0000 1.1.2.3 @@ -1,3 +1,52 @@ +/* The source in this file is derived from the reference implementation + * in RFC 2617. + * RFC 2617 is Copyright (C) The Internet Society (1999). All Rights Reserved. + * + * The following copyright and licence statement covers all changes made to the + * reference implementation. + * + * Key changes to the reference implementation were: + * alteration to a plain C layout. + * Create CvtBin function + * Allow CalcHA1 to make use of precaculated username:password:realm hash's + * to prevent squid knowing the users password (idea suggested in RFC 2617). + */ + + +/* + * $Id$ + * + * DEBUG: + * AUTHOR: RFC 2617 & Robert Collins + * + * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from the + * Internet community. Development is led by Duane Wessels of the + * National Laboratory for Applied Network Research and funded by the + * National Science Foundation. Squid is Copyrighted (C) 1998 by + * the Regents of the University of California. Please see the + * COPYRIGHT file for full details. Squid incorporates software + * developed and/or copyrighted by other sources. Please see the + * CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + #ifndef RFC2617_H #define RFC2617_H #include "md5.h" Index: squid/lib/rfc2617.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/rfc2617.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/lib/rfc2617.c 10 Jan 2001 10:03:10 -0000 1.1.2.4 +++ squid/lib/rfc2617.c 10 Jan 2001 10:12:08 -0000 1.1.2.5 @@ -1,3 +1,51 @@ +/* The source in this file is derived from the reference implementation + * in RFC 2617. + * RFC 2617 is Copyright (C) The Internet Society (1999). All Rights Reserved. + * + * The following copyright and licence statement covers all changes made to the + * reference implementation. + * + * Key changes were: alteration to a plain C layout. + * Create CvtBin function + * Allow CalcHA1 to make use of precaculated username:password:realm hash's + * to prevent squid knowing the users password (idea suggested in RFC 2617). + */ + + +/* + * $Id$ + * + * DEBUG: + * AUTHOR: RFC 2617 & Robert Collins + * + * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from the + * Internet community. Development is led by Duane Wessels of the + * National Laboratory for Applied Network Research and funded by the + * National Science Foundation. Squid is Copyrighted (C) 1998 by + * the Regents of the University of California. Please see the + * COPYRIGHT file for full details. Squid incorporates software + * developed and/or copyrighted by other sources. Please see the + * CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + #include "config.h" #include #include "rfc2617.h" @@ -90,7 +138,7 @@ MD5_CTX Md5Ctx; HASH HA2; HASH RespHash; - HASHHEX HA2Hex; + HASHHEX HA2Hex; /* calculate H(A2) */ Index: squid/src/auth/digest/auth_digest.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/digest/auth_digest.c,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -r1.1.2.18 -r1.1.2.19 --- squid/src/auth/digest/auth_digest.c 10 Jan 2001 09:58:27 -0000 1.1.2.18 +++ squid/src/auth/digest/auth_digest.c 10 Jan 2001 10:12:38 -0000 1.1.2.19 @@ -226,12 +226,6 @@ while ((nonce=((digest_nonce_h *)hash_next(digest_nonce_cache)))) { assert (nonce->flags.incache); authDigestNoncePurge(nonce); -#if 0 - hash_remove_link(digest_nonce_cache, (hash_link *)nonce); - nonce->flags.incache=0; - /* the cache's link */ - authDigestNonceUnlink(nonce); -#endif } } if (digest_nonce_pool) @@ -271,12 +265,6 @@ /* if it is tied to a auth_user, remove the tie */ authDigestNonceUserUnlink(nonce); authDigestNoncePurge(nonce); -#if 0 - hash_remove_link(digest_nonce_cache, (hash_link *)nonce); - nonce->flags.incache=0; - /* the cache's link */ - authDigestNonceUnlink(nonce); -#endif } } debug(29,3) ("authenticateDigestNonceCacheCleanup: Finished cleaning the nonce cache.\n"); @@ -1088,12 +1076,6 @@ debug(29,9)("authenticateDigestDecodeAuth: beginning\n"); assert(auth_user_request != NULL); -#if 0 - /* digest until proved otherwise */ - auth_user->auth_type = AUTH_DIGEST; - /* have we been called before? */ - assert(auth_user->scheme_data == NULL); -#endif digest_request = authDigestRequestNew(); /* trim DIGEST from string */