Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #321 from PartialVolume/check_prng_is_generating_data

Browse Source 
Check that the prng produces output.
This commit is contained in:
PartialVolume
2021-05-29 21:31:47 +01:00
committed by GitHub
parent 5bc61f2bdd 5adc34b9e3
commit 630d107558
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pass.c
View File

@@ -248,6 +248,9 @@ int nwipe_random_pass( NWIPE_METHOD_SIGNATURE )
/* Counter to track when to do a fdatasync. */
int i = 0;
/* general index counter */
int idx;
if( c->prng_seed.s == NULL )
{
nwipe_log( NWIPE_LOG_SANITY, "__FUNCTION__: Null seed pointer." );
@@ -260,8 +263,9 @@ int nwipe_random_pass( NWIPE_METHOD_SIGNATURE )
return -1;
}
/* Create the output buffer. */
b = malloc( c->device_stat.st_blksize );
/* Create the initialised output buffer. Initialised because we don't want memory leaks
* to disk in the event of some future undetected bug in a prng or it's implementation ) */
b = calloc( c->device_stat.st_blksize, sizeof( char ) );
/* Check the memory allocation. */
if( !b )
@@ -317,6 +321,26 @@ int nwipe_random_pass( NWIPE_METHOD_SIGNATURE )
/* Fill the output buffer with the random pattern. */
c->prng->read( &c->prng_state, b, blocksize );
/* For the first block only, check the prng actually wrote something to the buffer */
if( z == c->device_size )
{
idx = c->device_stat.st_blksize;
while( idx > 0 )
{
if( b[idx] != 0 )
{
nwipe_log( NWIPE_LOG_NOTICE, "prng stream is active" );
break;
}
idx--;
}
if( idx == 0 )
{
nwipe_log( NWIPE_LOG_FATAL, "ERROR, prng wrote nothing to the buffer" );
return -1;
}
}
/* Write the next block out to the device. */
r = write( c->device_fd, b, blocksize );

4
src/version.c
View File

@@ -4,7 +4,7 @@
* used by configure to dynamically assign those values
* to documentation files.
*/
const char* version_string = "0.30.006";
const char* version_string = "0.30.007";
const char* program_name = "nwipe";
const char* author_name = "Martijn van Brummelen";
const char* email_address = "git@brumit.nl";
@@ -14,4 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE.\n";
const char* banner = "nwipe 0.30.006";
const char* banner = "nwipe 0.30.007";