diff options
Diffstat (limited to 'dst')
| -rw-r--r-- | dst/dst_api.c | 5 | ||||
| -rw-r--r-- | dst/prandom.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dst/dst_api.c b/dst/dst_api.c index 8925c66..7eac3a8 100644 --- a/dst/dst_api.c +++ b/dst/dst_api.c @@ -1,10 +1,11 @@ #ifndef LINT -static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/dst_api.c,v 1.9 2009-10-29 00:46:48 sar Exp $"; +static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/dst_api.c,v 1.9.6.1 2012-04-11 15:43:55 sar Exp $"; #endif /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * Portions Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -342,7 +343,7 @@ dst_read_key(const char *in_keyname, const unsigned in_id, in_alg)); return (NULL); } - if ((type && (DST_PUBLIC | DST_PRIVATE)) == 0) + if ((type & (DST_PUBLIC | DST_PRIVATE)) == 0) return (NULL); if (in_keyname == NULL) { EREPORT(("dst_read_private_key(): Null key name passed in\n")); diff --git a/dst/prandom.c b/dst/prandom.c index 4de3fe4..5efad8f 100644 --- a/dst/prandom.c +++ b/dst/prandom.c @@ -1,9 +1,9 @@ #ifndef LINT -static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/prandom.c,v 1.8.6.1 2009-11-20 01:49:01 sar Exp $"; +static const char rcsid[] = "$Header: /proj/cvs/prod/DHCP/dst/prandom.c,v 1.8.6.2 2012-03-09 11:28:11 tomasz Exp $"; #endif /* + * Portions Copyright (c) 2007,2009,2012 by Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. - * Portions Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -694,7 +694,6 @@ own_random(dst_work *work) { int dir = 0, b; int bytes, n, cmd = 0, dig = 0; - int start =0; /* * now get the initial seed to put into the quick random function from * the address of the work structure @@ -709,7 +708,6 @@ own_random(dst_work *work) /* pick a random number in the range of 0..7 based on that random number * perform some operations that yield random data */ - start = work->filled; n = (dst_s_quick_random(bytes) >> DST_SHIFT) & 0x07; switch (n) { case 0: |