Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some cases where the EREPORT macro defined to null (as in the NetBSD

Browse Source 
build) could change the behaviour of the code in unexpected ways
This commit is contained in:
drochner 2010-01-25 20:33:57 +00:00
parent c6660bc8ea
commit 7393fe922a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/dhcp/dst/dst_api.c vendored
View File

@ -1,5 +1,5 @@
#ifndef LINT
static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/dst_api.c,v 1.5 2005/08/11 17:13:21 drochner Exp $";
static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/dst_api.c,v 1.6 2010/01/25 20:33:57 drochner Exp $";
#endif
/*
@ -684,9 +684,10 @@ dst_dnskey_to_key(const char *in_name,
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 @@ dst_key_to_dnskey(const DST_KEY *key, u_char *out_storage,
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 @@ dst_s_read_private_key_file(char *name, DST_KEY *pk_key, unsigned in_id,
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 */

5
dist/dhcp/dst/prandom.c vendored
View File

@ -1,5 +1,5 @@
#ifndef LINT
static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/prandom.c,v 1.4 2005/08/11 17:13:21 drochner Exp $";
static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/Attic/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 @@ dst_s_semi_random(u_char *output, unsigned size)
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;