Module Name: src
Committed By: apb
Date: Sat Dec 17 13:18:21 UTC 2011
Modified Files:
src/sbin/rndctl: rndctl.c
Log Message:
Make "rndctl -L" overwrite the file with zeros, not with the
same data that was just read from the file.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.22 src/sbin/rndctl/rndctl.c:1.23
--- src/sbin/rndctl/rndctl.c:1.22 Sat Nov 26 01:17:17 2011
+++ src/sbin/rndctl/rndctl.c Sat Dec 17 13:18:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.22 2011/11/26 01:17:17 tls Exp $ */
+/* $NetBSD: rndctl.c,v 1.23 2011/12/17 13:18:20 apb Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -33,7 +33,7 @@
#include <sha1.h>
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.22 2011/11/26 01:17:17 tls Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.23 2011/12/17 13:18:20 apb Exp $");
#endif
@@ -181,7 +181,7 @@ static void
do_load(const char *const filename)
{
int fd;
- rndsave_t rs;
+ rndsave_t rs, rszero;
rnddata_t rd;
SHA1_CTX s;
uint8_t digest[SHA1_DIGEST_LENGTH];
@@ -197,7 +197,8 @@ do_load(const char *const filename)
err(1, "read");
}
- if (write(fd, &rs, sizeof(rs) != sizeof(rs))) {
+ memset(&rszero, 0, sizeof(rszero));
+ if (write(fd, &rszero, sizeof(rszero) != sizeof(rszero))) {
err(1, "overwrite");
}
fsync_range(fd, FDATASYNC|FDISKSYNC, (off_t)0, (off_t)0);
