From f052a01ff268cdbbf3e6f600b06d02ed8573badf Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Fri, 4 Apr 2008 23:47:01 +0000 Subject: [PATCH] update copyright notice --- bin/dig/host.docbook | 5 +++-- lib/dns/include/dns/nsec3.h | 9 ++++----- lib/isc/base32.c | 15 +++++++-------- lib/isc/iterated_hash.c | 22 +++++++++++++++++++-- lib/isc/pthreads/mutex.c | 38 ++++++++++++++++++------------------- 5 files changed, 53 insertions(+), 36 deletions(-) diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook index c3622442db..bbd8d72b18 100644 --- a/bin/dig/host.docbook +++ b/bin/dig/host.docbook @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + @@ -41,6 +41,7 @@ 2004 2005 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h index 50fe77dd69..38993886af 100644 --- a/lib/dns/include/dns/nsec3.h +++ b/lib/dns/include/dns/nsec3.h @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 1999-2001, 2003 Internet Software Consortium. + * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsec3.h,v 1.2 2008/04/04 05:34:05 marka Exp $ */ +/* $Id: nsec3.h,v 1.3 2008/04/04 23:47:01 tbox Exp $ */ #ifndef DNS_NSEC3_H #define DNS_NSEC3_H 1 @@ -43,7 +42,7 @@ isc_result_t dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, unsigned int hashalg, unsigned int optin, unsigned int iterations, - const unsigned char *salt, size_t salt_length, + const unsigned char *salt, size_t salt_length, const unsigned char *nexthash, size_t hash_length, unsigned char *buffer, dns_rdata_t *rdata); /* diff --git a/lib/isc/base32.c b/lib/isc/base32.c index 4299511a60..0deabc526a 100644 --- a/lib/isc/base32.c +++ b/lib/isc/base32.c @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 1998-2001, 2003 Internet Software Consortium. + * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: base32.c,v 1.2 2008/04/04 05:34:06 marka Exp $ */ +/* $Id: base32.c,v 1.3 2008/04/04 23:47:01 tbox Exp $ */ /*! \file */ @@ -66,7 +65,7 @@ base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, memset(buf, 0, sizeof(buf)); while (source->length > 0) { buf[0] = base[((source->base[0]>>3)&0x1f)]; /* 5 + */ - if (source->length == 1) { + if (source->length == 1) { buf[1] = base[(source->base[0]<<2)&0x1c]; buf[2] = buf[3] = buf[4] = '='; buf[5] = buf[6] = buf[7] = '='; @@ -253,7 +252,7 @@ base32_decode_finish(base32_decode_ctx_t *ctx) { static isc_result_t base32_tobuffer(isc_lex_t *lexer, const char base[], isc_buffer_t *target, int length) -{ +{ base32_decode_ctx_t ctx; isc_textregion_t *tr; isc_token_t token; @@ -305,7 +304,7 @@ base32_decodestring(const char *cstr, const char base[], isc_buffer_t *target) { continue; RETERR(base32_decode_char(&ctx, c)); } - RETERR(base32_decode_finish(&ctx)); + RETERR(base32_decode_finish(&ctx)); return (ISC_R_SUCCESS); } @@ -329,7 +328,7 @@ base32_decoderegion(isc_region_t *source, const char base[], isc_buffer_t *targe RETERR(base32_decode_char(&ctx, c)); isc_region_consume(source, 1); } - RETERR(base32_decode_finish(&ctx)); + RETERR(base32_decode_finish(&ctx)); return (ISC_R_SUCCESS); } diff --git a/lib/isc/iterated_hash.c b/lib/isc/iterated_hash.c index ad587ff3f1..ce89ebe4c5 100644 --- a/lib/isc/iterated_hash.c +++ b/lib/isc/iterated_hash.c @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: iterated_hash.c,v 1.3 2008/04/04 23:47:01 tbox Exp $ */ + #include #include @@ -6,8 +24,8 @@ int isc_iterated_hash(unsigned char out[ISC_SHA1_DIGESTLENGTH], unsigned int hashalg, int iterations, - const unsigned char *salt, int saltlength, - const unsigned char *in, int inlength) + const unsigned char *salt, int saltlength, + const unsigned char *in, int inlength) { isc_sha1_t ctx; int n = 0; diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c index b80664e8cb..b57d9eee8d 100644 --- a/lib/isc/pthreads/mutex.c +++ b/lib/isc/pthreads/mutex.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mutex.c,v 1.15 2008/04/04 01:49:09 jinmei Exp $ */ +/* $Id: mutex.c,v 1.16 2008/04/04 23:47:01 tbox Exp $ */ /*! \file */ @@ -36,23 +36,23 @@ /*% Operations on timevals; adapted from FreeBSD's sys/time.h */ #define timevalclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) #define timevaladd(vvp, uvp) \ - do { \ - (vvp)->tv_sec += (uvp)->tv_sec; \ - (vvp)->tv_usec += (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) + do { \ + (vvp)->tv_sec += (uvp)->tv_sec; \ + (vvp)->tv_usec += (uvp)->tv_usec; \ + if ((vvp)->tv_usec >= 1000000) { \ + (vvp)->tv_sec++; \ + (vvp)->tv_usec -= 1000000; \ + } \ + } while (0) #define timevalsub(vvp, uvp) \ - do { \ - (vvp)->tv_sec -= (uvp)->tv_sec; \ - (vvp)->tv_usec -= (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ - } while (0) + do { \ + (vvp)->tv_sec -= (uvp)->tv_sec; \ + (vvp)->tv_usec -= (uvp)->tv_usec; \ + if ((vvp)->tv_usec < 0) { \ + (vvp)->tv_sec--; \ + (vvp)->tv_usec += 1000000; \ + } \ + } while (0) /*@}*/ @@ -236,7 +236,7 @@ isc_mutex_init_errcheck(isc_mutex_t *mp) if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK) != 0) return (ISC_R_UNEXPECTED); - + err = pthread_mutex_init(mp, &attr) != 0) if (err == ENOMEM) return (ISC_R_NOMEMORY);