mirror of
https://github.com/martijnvanbrummelen/nwipe.git
synced 2026-02-20 13:42:14 +00:00
add bmb21-2019 wipe function
This commit is contained in:
28
src/gui.c
28
src/gui.c
@@ -2305,7 +2305,7 @@ void nwipe_gui_method( void )
|
||||
extern int terminate_signal;
|
||||
|
||||
/* The number of implemented methods. */
|
||||
const int count = 11;
|
||||
const int count = 12;
|
||||
|
||||
/* The first tabstop. */
|
||||
const int tab1 = 2;
|
||||
@@ -2371,6 +2371,10 @@ void nwipe_gui_method( void )
|
||||
{
|
||||
focus = 10;
|
||||
}
|
||||
if( nwipe_options.method == &nwipe_bmb )
|
||||
{
|
||||
focus = 11;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
@@ -2394,6 +2398,7 @@ void nwipe_gui_method( void )
|
||||
mvwprintw( main_window, yy++, tab1, " %s", nwipe_method_label( &nwipe_verify_one ) );
|
||||
mvwprintw( main_window, yy++, tab1, " %s", nwipe_method_label( &nwipe_is5enh ) );
|
||||
mvwprintw( main_window, yy++, tab1, " %s", nwipe_method_label( &nwipe_bruce7 ) );
|
||||
mvwprintw( main_window, yy++, tab1, " %s", nwipe_method_label( &nwipe_bmb ) );
|
||||
mvwprintw( main_window, yy++, tab1, " " );
|
||||
|
||||
/* Print the cursor. */
|
||||
@@ -2542,6 +2547,23 @@ void nwipe_gui_method( void )
|
||||
mvwprintw( main_window, 10, tab2, "it performs five additional passes of PRNG- " );
|
||||
mvwprintw( main_window, 11, tab2, "generated random data to maximize security. " );
|
||||
break;
|
||||
case 11:
|
||||
|
||||
mvwprintw( main_window, 2, tab2, "Security Level: very high (6 passes)" );
|
||||
|
||||
mvwprintw( main_window, 4, tab2, "BMB21-2019 Chinese State Secrets Bureau standard " );
|
||||
mvwprintw( main_window, 5, tab2, "Technical Requirement for Data Sanitization " );
|
||||
mvwprintw( main_window, 6, tab2, ". of Storage Media Involving State Secrets " );
|
||||
mvwprintw(
|
||||
main_window,
|
||||
7,
|
||||
tab2,
|
||||
"This method first overwrites the device with " );
|
||||
mvwprintw( main_window, 8, tab2, "ones (0xFF), followed by zeroes (0x00). Then, " );
|
||||
mvwprintw( main_window, 9, tab2, "it performs three additional passes of PRNG- " );
|
||||
mvwprintw( main_window, 10, tab2, "generated random data to maximize security. " );
|
||||
mvwprintw( main_window, 11, tab2, "finally overwrites ones (0xFF) " );
|
||||
break;
|
||||
|
||||
} /* switch */
|
||||
|
||||
@@ -2641,6 +2663,10 @@ void nwipe_gui_method( void )
|
||||
case 10:
|
||||
nwipe_options.method = &nwipe_bruce7;
|
||||
break;
|
||||
|
||||
case 11:
|
||||
nwipe_options.method = &nwipe_bmb;
|
||||
break;
|
||||
}
|
||||
|
||||
} /* nwipe_gui_method */
|
||||
|
||||
41
src/method.c
41
src/method.c
@@ -69,6 +69,7 @@ const char* nwipe_verify_zero_label = "Verify Zeros (0x00)";
|
||||
const char* nwipe_verify_one_label = "Verify Ones (0xFF)";
|
||||
const char* nwipe_is5enh_label = "HMG IS5 Enhanced";
|
||||
const char* nwipe_bruce7_label = "Bruce Schneier 7-Pass";
|
||||
const char* nwipe_bmb_label = "BMB21-2019";
|
||||
|
||||
const char* nwipe_unknown_label = "Unknown Method (FIXME)";
|
||||
|
||||
@@ -123,6 +124,10 @@ const char* nwipe_method_label( void* method )
|
||||
{
|
||||
return nwipe_bruce7_label;
|
||||
}
|
||||
if( method == &nwipe_bmb )
|
||||
{
|
||||
return nwipe_bmb_label;
|
||||
}
|
||||
|
||||
/* else */
|
||||
return nwipe_unknown_label;
|
||||
@@ -799,6 +804,42 @@ void* nwipe_bruce7( void* ptr )
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void* nwipe_bmb( void* ptr )
|
||||
{
|
||||
/**
|
||||
* BMB Secure Wipe Method:
|
||||
* Pass 1: 0xFF
|
||||
* Pass 2: 0x00
|
||||
* Pass 3-5: 3× Random
|
||||
* Pass 6: 0xFF
|
||||
*/
|
||||
|
||||
nwipe_context_t* c = (nwipe_context_t*) ptr;
|
||||
|
||||
time( &c->start_time );
|
||||
c->wipe_status = 1;
|
||||
|
||||
char onefill[1] = { '\xFF' };
|
||||
char zerofill[1] = { '\x00' };
|
||||
|
||||
nwipe_pattern_t patterns[] = {
|
||||
{ 1, &onefill[0] }, // 0xFF
|
||||
{ 1, &zerofill[0] }, // 0x00
|
||||
{ -1, "" }, // RANDOM
|
||||
{ -1, "" }, // RANDOM
|
||||
{ -1, "" }, // RANDOM
|
||||
{ 1, &onefill[0] }, // 0xFF
|
||||
{ 0, NULL } // 0X00
|
||||
};
|
||||
|
||||
c->result = nwipe_runmethod( c, patterns );
|
||||
|
||||
c->wipe_status = 0;
|
||||
time( &c->end_time );
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int nwipe_runmethod( nwipe_context_t* c, nwipe_pattern_t* patterns )
|
||||
{
|
||||
/**
|
||||
|
||||
@@ -55,6 +55,7 @@ void* nwipe_one( void* ptr );
|
||||
void* nwipe_verify_zero( void* ptr );
|
||||
void* nwipe_verify_one( void* ptr );
|
||||
void* nwipe_bruce7( void* ptr );
|
||||
void* nwipe_bmb( void* ptr );
|
||||
|
||||
void calculate_round_size( nwipe_context_t* );
|
||||
|
||||
|
||||
@@ -391,6 +391,11 @@ int nwipe_options_parse( int argc, char** argv )
|
||||
nwipe_options.method = &nwipe_bruce7;
|
||||
break;
|
||||
}
|
||||
if( strcmp( optarg, "bmb" ) == 0 )
|
||||
{
|
||||
nwipe_options.method = &nwipe_bmb;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Else we do not know this wipe method. */
|
||||
fprintf( stderr, "Error: Unknown wipe method '%s'.\n", optarg );
|
||||
@@ -705,6 +710,7 @@ void display_help()
|
||||
puts( " verify_one - Verifies disk is 0xFF filled" );
|
||||
puts( " is5enh - HMG IS5 enhanced\n" );
|
||||
puts( " bruce7 - Schneier Bruce 7-pass mixed pattern\n" );
|
||||
puts( " bmb - BMB21-2019 mixed pattern\n" );
|
||||
puts( " -l, --logfile=FILE Filename to log to. Default is STDOUT\n" );
|
||||
puts( " -P, --PDFreportpath=PATH Path to write PDF reports to. Default is \".\"" );
|
||||
puts( " If set to \"noPDF\" no PDF reports are written.\n" );
|
||||
|
||||
Reference in New Issue
Block a user