Module Name: src
Committed By: drochner
Date: Mon Jan 25 20:33:57 UTC 2010
Modified Files:
src/dist/dhcp/dst: dst_api.c prandom.c
Log Message:
fix some cases where the EREPORT macro defined to null (as in the NetBSD
build) could change the behaviour of the code in unexpected ways
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/dhcp/dst/dst_api.c
cvs rdiff -u -r1.4 -r1.5 src/dist/dhcp/dst/prandom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/dhcp/dst/dst_api.c
diff -u src/dist/dhcp/dst/dst_api.c:1.5 src/dist/dhcp/dst/dst_api.c:1.6
--- src/dist/dhcp/dst/dst_api.c:1.5 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/dst/dst_api.c Mon Jan 25 20:33:57 2010
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_api.c,v 1.5 2005/08/11 17:13:21 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_api.c,v 1.6 2010/01/25 20:33:57 drochner Exp $";
#endif
/*
@@ -684,9 +684,10 @@
if (key_st->dk_func->from_dns_key(key_st, &rdata[start],
len - start) > 0)
return (key_st);
- } else
+ } else {
EREPORT(("dst_dnskey_to_public_key(): unsuppored alg %d\n",
alg));
+ }
SAFE_FREE(key_st);
return (key_st);
@@ -745,9 +746,10 @@
return (enc_len + loc);
else
return (-1);
- } else
+ } else {
EREPORT(("dst_key_to_dnskey(): Unsupported ALG %d\n",
key->dk_alg));
+ }
return (-1);
}
@@ -877,10 +879,11 @@
EREPORT(("dst_s_read_private_key_file(): Unknown keyfile %d.%d version for %s\n",
file_major, file_minor, name));
goto fail;
- } else if (file_major > major || file_minor > minor)
+ } else if (file_major > major || file_minor > minor) {
EREPORT((
"dst_s_read_private_key_file(): Keyfile %s version higher than mine %d.%d MAY FAIL\n",
name, file_major, file_minor));
+ }
while (*p++ != '\n') ; /* skip to end of line */
Index: src/dist/dhcp/dst/prandom.c
diff -u src/dist/dhcp/dst/prandom.c:1.4 src/dist/dhcp/dst/prandom.c:1.5
--- src/dist/dhcp/dst/prandom.c:1.4 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/dst/prandom.c Mon Jan 25 20:33:57 2010
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/prandom.c,v 1.4 2005/08/11 17:13:21 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/prandom.c,v 1.5 2010/01/25 20:33:57 drochner Exp $";
#endif
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -850,8 +850,9 @@
i = dst_sign_data(SIG_MODE_ALL, my_key, NULL,
(u_char *) counter, hb_size,
semi_old, sizeof(semi_old));
- if (i != hb_size)
+ if (i != hb_size) {
EREPORT(("HMAC SIGNATURE FAILURE %d\n", i));
+ }
cnt++;
if (size - out < i) /* Not all data is needed */
semi_loc = i = size - out;
