Commit 9a14f870 authored by Automatic Updater's avatar Automatic Updater

update copyright notice

parent faa406d2
/* /*
* Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or 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 * purpose with or without fee is hereby granted, provided that the above
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: base32.c,v 1.4 2009/01/18 00:32:04 fdupont Exp $ */ /* $Id: base32.c,v 1.5 2009/01/18 23:48:14 tbox Exp $ */
/*! \file */ /*! \file */
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium. * Copyright (C) 2000-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: entropy.c,v 1.19 2009/01/18 00:34:19 fdupont Exp $ */ /* $Id: entropy.c,v 1.20 2009/01/18 23:48:14 tbox Exp $ */
/*! \file /*! \file
* \brief * \brief
...@@ -1262,7 +1262,7 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source, ...@@ -1262,7 +1262,7 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source,
if (final_result != ISC_R_SUCCESS) if (final_result != ISC_R_SUCCESS)
final_result = result; final_result = result;
} }
/* /*
* final_result is ISC_R_SUCCESS if at least one source of entropy * final_result is ISC_R_SUCCESS if at least one source of entropy
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: ratelimiter.h,v 1.22 2009/01/17 23:31:36 fdupont Exp $ */ /* $Id: ratelimiter.h,v 1.23 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_RATELIMITER_H #ifndef ISC_RATELIMITER_H
#define ISC_RATELIMITER_H 1 #define ISC_RATELIMITER_H 1
...@@ -71,7 +71,7 @@ isc_result_t ...@@ -71,7 +71,7 @@ isc_result_t
isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task, isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task,
isc_event_t **eventp); isc_event_t **eventp);
/*%< /*%<
* Queue an event for rate-limited execution. * Queue an event for rate-limited execution.
* *
* This is similar * This is similar
* to doing an isc_task_send() to the 'task', except that the * to doing an isc_task_send() to the 'task', except that the
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: serial.h,v 1.17 2009/01/17 23:34:27 fdupont Exp $ */ /* $Id: serial.h,v 1.18 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_SERIAL_H #ifndef ISC_SERIAL_H
#define ISC_SERIAL_H 1 #define ISC_SERIAL_H 1
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: sockaddr.h,v 1.56 2009/01/17 23:36:13 fdupont Exp $ */ /* $Id: sockaddr.h,v 1.57 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_SOCKADDR_H #ifndef ISC_SOCKADDR_H
#define ISC_SOCKADDR_H 1 #define ISC_SOCKADDR_H 1
......
/* /*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2002 Internet Software Consortium. * Copyright (C) 1998-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.h,v 1.86 2009/01/17 23:38:18 fdupont Exp $ */ /* $Id: socket.h,v 1.87 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_SOCKET_H #ifndef ISC_SOCKET_H
#define ISC_SOCKET_H 1 #define ISC_SOCKET_H 1
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1996-2001 Internet Software Consortium. * Copyright (C) 1996-2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: symtab.h,v 1.25 2009/01/17 23:39:55 fdupont Exp $ */ /* $Id: symtab.h,v 1.26 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_SYMTAB_H #ifndef ISC_SYMTAB_H
#define ISC_SYMTAB_H 1 #define ISC_SYMTAB_H 1
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001, 2003 Internet Software Consortium. * Copyright (C) 1998-2001, 2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: task.h,v 1.62 2009/01/17 23:42:01 fdupont Exp $ */ /* $Id: task.h,v 1.63 2009/01/18 23:48:14 tbox Exp $ */
#ifndef ISC_TASK_H #ifndef ISC_TASK_H
#define ISC_TASK_H 1 #define ISC_TASK_H 1
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/*! \file isc/task.h /*! \file isc/task.h
* \brief The task system provides a lightweight execution context, which is * \brief The task system provides a lightweight execution context, which is
* basically an event queue. * basically an event queue.
* When a task's event queue is non-empty, the * When a task's event queue is non-empty, the
* task is runnable. A small work crew of threads, typically one per CPU, * task is runnable. A small work crew of threads, typically one per CPU,
...@@ -498,7 +498,7 @@ isc_task_beginexclusive(isc_task_t *task); ...@@ -498,7 +498,7 @@ isc_task_beginexclusive(isc_task_t *task);
* current event, and prevents any new events from executing in any of the * current event, and prevents any new events from executing in any of the
* tasks sharing a task manager with 'task'. * tasks sharing a task manager with 'task'.
* *
* The exclusive access must be relinquished by calling * The exclusive access must be relinquished by calling
* isc_task_endexclusive() before returning from the current event handler. * isc_task_endexclusive() before returning from the current event handler.
* *
* Requires: * Requires:
...@@ -513,7 +513,7 @@ isc_task_beginexclusive(isc_task_t *task); ...@@ -513,7 +513,7 @@ isc_task_beginexclusive(isc_task_t *task);
void void
isc_task_endexclusive(isc_task_t *task); isc_task_endexclusive(isc_task_t *task);
/*%< /*%<
* Relinquish the exclusive access obtained by isc_task_beginexclusive(), * Relinquish the exclusive access obtained by isc_task_beginexclusive(),
* allowing other tasks to execute. * allowing other tasks to execute.
* *
* Requires: * Requires:
......
/* /*
* Copyright (C) 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2007-2009 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or 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 * purpose with or without fee is hereby granted, provided that the above
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: radix.c,v 1.22 2009/01/18 00:46:01 fdupont Exp $ */ /* $Id: radix.c,v 1.23 2009/01/18 23:48:14 tbox Exp $ */
/* /*
* This source was adapted from MRT's RCS Ids: * This source was adapted from MRT's RCS Ids:
......
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001, 2003 Internet Software Consortium. * Copyright (C) 1998-2001, 2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rwlock.c,v 1.45 2009/01/18 00:48:30 fdupont Exp $ */ /* $Id: rwlock.c,v 1.46 2009/01/18 23:48:14 tbox Exp $ */
/*! \file */ /*! \file */
...@@ -55,17 +55,17 @@ print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) { ...@@ -55,17 +55,17 @@ print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) {
"rwlock %p thread %lu %s(%s): %s, %u active, " "rwlock %p thread %lu %s(%s): %s, %u active, "
"%u granted, %u rwaiting, %u wwaiting\n"), "%u granted, %u rwaiting, %u wwaiting\n"),
rwl, isc_thread_self(), operation, rwl, isc_thread_self(), operation,
(type == isc_rwlocktype_read ? (type == isc_rwlocktype_read ?
isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK, isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
ISC_MSG_READ, "read") : ISC_MSG_READ, "read") :
isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK, isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
ISC_MSG_WRITE, "write")), ISC_MSG_WRITE, "write")),
(rwl->type == isc_rwlocktype_read ? (rwl->type == isc_rwlocktype_read ?
isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK, isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
ISC_MSG_READING, "reading") : ISC_MSG_READING, "reading") :
isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK, isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
ISC_MSG_WRITING, "writing")), ISC_MSG_WRITING, "writing")),
rwl->active, rwl->granted, rwl->readers_waiting, rwl->active, rwl->granted, rwl->readers_waiting,
rwl->writers_waiting); rwl->writers_waiting);
} }
#endif #endif
...@@ -381,7 +381,7 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { ...@@ -381,7 +381,7 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
BROADCAST(&rwl->writeable); BROADCAST(&rwl->writeable);
UNLOCK(&rwl->lock); UNLOCK(&rwl->lock);
} }
return (ISC_R_LOCKBUSY); return (ISC_R_LOCKBUSY);
} }
} else { } else {
...@@ -434,7 +434,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { ...@@ -434,7 +434,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
return (ISC_R_LOCKBUSY); return (ISC_R_LOCKBUSY);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
void void
...@@ -555,7 +555,7 @@ doit(isc_rwlock_t *rwl, isc_rwlocktype_t type, isc_boolean_t nonblock) { ...@@ -555,7 +555,7 @@ doit(isc_rwlock_t *rwl, isc_rwlocktype_t type, isc_boolean_t nonblock) {
((rwl->active == 0 || ((rwl->active == 0 ||
(rwl->type == isc_rwlocktype_read && (rwl->type == isc_rwlocktype_read &&
(rwl->writers_waiting == 0 || (rwl->writers_waiting == 0 ||
rwl->granted < rwl->read_quota))))) rwl->granted < rwl->read_quota)))))
{ {
rwl->type = isc_rwlocktype_read; rwl->type = isc_rwlocktype_read;
rwl->active++; rwl->active++;
...@@ -751,7 +751,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { ...@@ -751,7 +751,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
rwl->type = isc_rwlocktype_write; rwl->type = isc_rwlocktype_write;
rwl->active = 1; rwl->active = 1;
} }
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
isc_result_t isc_result_t
...@@ -766,7 +766,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { ...@@ -766,7 +766,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
REQUIRE(VALID_RWLOCK(rwl)); REQUIRE(VALID_RWLOCK(rwl));
REQUIRE(rwl->type == isc_rwlocktype_read); REQUIRE(rwl->type == isc_rwlocktype_read);
REQUIRE(rwl->active != 0); REQUIRE(rwl->active != 0);
/* If we are the only reader then succeed. */ /* If we are the only reader then succeed. */
if (rwl->active == 1) if (rwl->active == 1)
rwl->type = isc_rwlocktype_write; rwl->type = isc_rwlocktype_write;
......
/* /*
* Copyright (C) 2005-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or 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 * purpose with or without fee is hereby granted, provided that the above
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: sha2.c,v 1.14 2009/01/18 00:50:21 fdupont Exp $ */ /* $Id: sha2.c,v 1.15 2009/01/18 23:48:14 tbox Exp $ */
/* $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $ */ /* $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $ */
/* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */ /* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* 3. Neither the name of the copyright holder nor the names of contributors * 3. Neither the name of the copyright holder nor the names of contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
* *
* And for little-endian machines, add: * And for little-endian machines, add:
* *
* \#define BYTE_ORDER LITTLE_ENDIAN * \#define BYTE_ORDER LITTLE_ENDIAN
* *
* Or for big-endian machines: * Or for big-endian machines:
* *
...@@ -414,12 +414,12 @@ isc_sha224_init(isc_sha224_t *context) { ...@@ -414,12 +414,12 @@ isc_sha224_init(isc_sha224_t *context) {
context->bitcount = 0; context->bitcount = 0;
} }
void void
isc_sha224_update(isc_sha224_t *context, const isc_uint8_t* data, size_t len) { isc_sha224_update(isc_sha224_t *context, const isc_uint8_t* data, size_t len) {
isc_sha256_update((isc_sha256_t *)context, data, len); isc_sha256_update((isc_sha256_t *)context, data, len);
} }
void void
isc_sha224_final(isc_uint8_t digest[], isc_sha224_t *context) { isc_sha224_final(isc_uint8_t digest[], isc_sha224_t *context) {
isc_uint8_t sha256_digest[ISC_SHA256_DIGESTLENGTH]; isc_uint8_t sha256_digest[ISC_SHA256_DIGESTLENGTH];
isc_sha256_final(sha256_digest, (isc_sha256_t *)context); isc_sha256_final(sha256_digest, (isc_sha256_t *)context);
...@@ -453,7 +453,7 @@ isc_sha224_end(isc_sha224_t *context, char buffer[]) { ...@@ -453,7 +453,7 @@ isc_sha224_end(isc_sha224_t *context, char buffer[]) {
char* char*
isc_sha224_data(const isc_uint8_t *data, size_t len, isc_sha224_data(const isc_uint8_t *data, size_t len,
char digest[ISC_SHA224_DIGESTSTRINGLENGTH]) char digest[ISC_SHA224_DIGESTSTRINGLENGTH])
{ {
isc_sha224_t context; isc_sha224_t context;
...@@ -483,7 +483,7 @@ isc_sha256_init(isc_sha256_t *context) { ...@@ -483,7 +483,7 @@ isc_sha256_init(isc_sha256_t *context) {
#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \ #define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
REVERSE32(*data++, W256[j]); \ REVERSE32(*data++, W256[j]); \
T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \ T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
K256[j] + W256[j]; \ K256[j] + W256[j]; \
(d) += T1; \ (d) += T1; \
(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
j++ j++
...@@ -615,11 +615,11 @@ isc_sha256_transform(isc_sha256_t *context, const isc_uint32_t* data) { ...@@ -615,11 +615,11 @@ isc_sha256_transform(isc_sha256_t *context, const isc_uint32_t* data) {
/* Part of the message block expansion: */ /* Part of the message block expansion: */
s0 = W256[(j+1)&0x0f]; s0 = W256[(j+1)&0x0f];
s0 = sigma0_256(s0); s0 = sigma0_256(s0);
s1 = W256[(j+14)&0x0f]; s1 = W256[(j+14)&0x0f];
s1 = sigma1_256(s1); s1 = sigma1_256(s1);
/* Apply the SHA-256 compression function to update a..h */ /* Apply the SHA-256 compression function to update a..h */
T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
(W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
T2 = Sigma0_256(a) + Maj(a, b, c); T2 = Sigma0_256(a) + Maj(a, b, c);
h = g; h = g;
...@@ -828,7 +828,7 @@ isc_sha512_init(isc_sha512_t *context) { ...@@ -828,7 +828,7 @@ isc_sha512_init(isc_sha512_t *context) {
#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \ #define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
REVERSE64(*data++, W512[j]); \ REVERSE64(*data++, W512[j]); \
T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \ T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
K512[j] + W512[j]; \ K512[j] + W512[j]; \
(d) += T1, \ (d) += T1, \
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \ (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
j++ j++
...@@ -838,7 +838,7 @@ isc_sha512_init(isc_sha512_t *context) { ...@@ -838,7 +838,7 @@ isc_sha512_init(isc_sha512_t *context) {
#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \ #define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \ T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
K512[j] + (W512[j] = *data++); \ K512[j] + (W512[j] = *data++); \
(d) += T1; \ (d) += T1; \
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
j++ j++
...@@ -851,7 +851,7 @@ isc_sha512_init(isc_sha512_t *context) { ...@@ -851,7 +851,7 @@ isc_sha512_init(isc_sha512_t *context) {
s1 = W512[(j+14)&0x0f]; \ s1 = W512[(j+14)&0x0f]; \
s1 = sigma1_512(s1); \ s1 = sigma1_512(s1); \
T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \ T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
(W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \ (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
(d) += T1; \ (d) += T1; \
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
j++ j++
...@@ -1163,12 +1163,12 @@ isc_sha384_init(isc_sha384_t *context) { ...@@ -1163,12 +1163,12 @@ isc_sha384_init(isc_sha384_t *context) {
context->bitcount[0] = context->bitcount[1] = 0; context->bitcount[0] = context->bitcount[1] = 0;
} }
void void
isc_sha384_update(isc_sha384_t *context, const isc_uint8_t* data, size_t len) { isc_sha384_update(isc_sha384_t *context, const isc_uint8_t* data, size_t len) {
isc_sha512_update((isc_sha512_t *)context, data, len); isc_sha512_update((isc_sha512_t *)context, data, len);
} }
void void
isc_sha384_final(isc_uint8_t digest[], isc_sha384_t *context) { isc_sha384_final(isc_uint8_t digest[], isc_sha384_t *context) {
isc_uint64_t *d = (isc_uint64_t*)digest; isc_uint64_t *d = (isc_uint64_t*)digest;
...@@ -1224,7 +1224,7 @@ isc_sha384_end(isc_sha384_t *context, char buffer[]) { ...@@ -1224,7 +1224,7 @@ isc_sha384_end(isc_sha384_t *context, char buffer[]) {
char* char*
isc_sha384_data(const isc_uint8_t *data, size_t len, isc_sha384_data(const isc_uint8_t *data, size_t len,
char digest[ISC_SHA384_DIGESTSTRINGLENGTH]) char digest[ISC_SHA384_DIGESTSTRINGLENGTH])
{ {
isc_sha384_t context; isc_sha384_t context;
......
/* /*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: ifiter_ioctl.c,v 1.61 2009/01/18 00:01:26 fdupont Exp $ */ /* $Id: ifiter_ioctl.c,v 1.62 2009/01/18 23:48:14 tbox Exp $ */
/*! \file /*! \file
* \brief * \brief
......
/* /*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.312 2009/01/18 00:06:06 fdupont Exp $ */ /* $Id: socket.c,v 1.313 2009/01/18 23:48:14 tbox Exp $ */
/*! \file */ /*! \file */
......
/* /*
* Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dir.c,v 1.17 2009/01/18 00:16:33 fdupont Exp $ */ /* $Id: dir.c,v 1.18 2009/01/18 23:48:14 tbox Exp $ */
/* Principal Authors: DCL */ /* Principal Authors: DCL */
......
/* /*
* Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any