Skip to content

Commit

Permalink
Merge pull request martijnvanbrummelen#398 from chkboom/isaac64
Browse files Browse the repository at this point in the history
Added ISAAC-64 PRNG for 64-bit systems.
  • Loading branch information
PartialVolume authored Jan 6, 2022
2 parents fe9666b + aa2c772 commit d964c92
Show file tree
Hide file tree
Showing 9 changed files with 331 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ AM_LDFLAGS =
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
bin_PROGRAMS = nwipe
nwipe_SOURCES = context.h isaac_rand/isaac_rand.c logging.h options.h prng.h version.h temperature.h nwipe.c gui.c isaac_rand/isaac_rand.h method.h pass.c device.c gui.h isaac_rand/isaac_standard.h mt19937ar-cok/mt19937ar-cok.c nwipe.h mt19937ar-cok/mt19937ar-cok.h pass.h device.h logging.c method.c options.c prng.c version.c temperature.c
nwipe_SOURCES = context.h logging.h options.h prng.h version.h temperature.h nwipe.c gui.c method.h pass.c device.c gui.h isaac_rand/isaac_standard.h isaac_rand/isaac_rand.h isaac_rand/isaac_rand.c isaac_rand/isaac64.h isaac_rand/isaac64.c mt19937ar-cok/mt19937ar-cok.c nwipe.h mt19937ar-cok/mt19937ar-cok.h pass.h device.h logging.c method.c options.c prng.c version.c temperature.c
nwipe_LDADD = $(PARTED_LIBS)
48 changes: 41 additions & 7 deletions src/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -1464,10 +1464,11 @@ void nwipe_gui_prng( void )

extern nwipe_prng_t nwipe_twister;
extern nwipe_prng_t nwipe_isaac;
extern nwipe_prng_t nwipe_isaac64;
extern int terminate_signal;

/* The number of implemented PRNGs. */
const int count = 2;
const int count = 3;

/* The first tabstop. */
const int tab1 = 2;
Expand Down Expand Up @@ -1497,6 +1498,10 @@ void nwipe_gui_prng( void )
{
focus = 1;
}
if( nwipe_options.prng == &nwipe_isaac64 )
{
focus = 2;
}

do
{
Expand All @@ -1506,15 +1511,16 @@ void nwipe_gui_prng( void )
nwipe_gui_create_all_windows_on_terminal_resize( 0, selection_footer );

/* Initialize the working row. */
yy = 2;
yy = 3;

/* Print the options. */
mvwprintw( main_window, yy++, tab1, " %s", nwipe_twister.label );
mvwprintw( main_window, yy++, tab1, " %s", nwipe_isaac.label );
mvwprintw( main_window, yy++, tab1, " %s", nwipe_isaac64.label );
mvwprintw( main_window, yy++, tab1, "" );

/* Print the cursor. */
mvwaddch( main_window, 2 + focus, tab1, ACS_RARROW );
mvwaddch( main_window, 3 + focus, tab1, ACS_RARROW );

switch( focus )
{
Expand Down Expand Up @@ -1564,6 +1570,34 @@ void nwipe_gui_prng( void )
yy++,
tab1,
" " );
mvwprintw( main_window,
yy++,
tab1,
"Performs best on a 32-bit CPU. Use ISAAC-64 if this system has a 64-bit CPU." );
break;

case 2:

mvwprintw( main_window,
yy++,
tab1,
"ISAAC-64, by Bob Jenkins, is like 32-bit ISAAC, but with a minimum period of" );
mvwprintw( main_window,
yy++,
tab1,
"2^77 and an expected period of 2^16583. It is difficult to recover the " );
mvwprintw( main_window,
yy++,
tab1,
"initial PRNG state by cryptanalysis of the ISAAC-64 stream. " );
mvwprintw( main_window,
yy++,
tab1,
" " );
mvwprintw( main_window,
yy++,
tab1,
"Performs best on a 64-bit CPU. Use ISAAC if this system has a 32-bit CPU. " );
break;

} /* switch */
Expand Down Expand Up @@ -1622,6 +1656,10 @@ void nwipe_gui_prng( void )
{
nwipe_options.prng = &nwipe_isaac;
}
if( focus == 2 )
{
nwipe_options.prng = &nwipe_isaac64;
}
return;

case KEY_BACKSPACE:
Expand Down Expand Up @@ -1791,10 +1829,6 @@ void nwipe_gui_verify( void )
{
nwipe_options.verify = focus;
}
if( nwipe_options.verify != NWIPE_VERIFY_NONE )
{
nwipe_options.noblank = 0;
}
return;

case KEY_BACKSPACE:
Expand Down
119 changes: 119 additions & 0 deletions src/isaac_rand/isaac64.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/*
------------------------------------------------------------------------------
isaac64.c: My random number generator for 64-bit machines.
By Bob Jenkins, 1996. Public Domain.
------------------------------------------------------------------------------
*/
#ifndef STANDARD
#include "isaac_standard.h"
#endif
#ifndef ISAAC64
#include "isaac64.h"
#endif


#define ind(mm,x) (*(ub8 *)((ub1 *)(mm) + ((x) & ((RANDSIZ-1)<<3))))
#define rngstep(mix,a,b,mm,m,m2,r,x) \
{ \
x = *m; \
a = (mix) + *(m2++); \
*(m++) = y = ind(mm,x) + a + b; \
*(r++) = b = ind(mm,y>>RANDSIZL) + x; \
}

void isaac64(rand64ctx *ctx)
{
register ub8 a,b,x,y,*m,*mm,*m2,*r,*mend;
mm=ctx->mm; r=ctx->randrsl;
a = ctx->aa; b = ctx->bb + (++ctx->cc);
for (m = mm, mend = m2 = m+(RANDSIZ/2); m<mend; )
{
rngstep(~(a^(a<<21)), a, b, mm, m, m2, r, x);
rngstep( a^(a>>5) , a, b, mm, m, m2, r, x);
rngstep( a^(a<<12) , a, b, mm, m, m2, r, x);
rngstep( a^(a>>33) , a, b, mm, m, m2, r, x);
}
for (m2 = mm; m2<mend; )
{
rngstep(~(a^(a<<21)), a, b, mm, m, m2, r, x);
rngstep( a^(a>>5) , a, b, mm, m, m2, r, x);
rngstep( a^(a<<12) , a, b, mm, m, m2, r, x);
rngstep( a^(a>>33) , a, b, mm, m, m2, r, x);
}
ctx->bb = b; ctx->aa = a;
}

#define mix(a,b,c,d,e,f,g,h) \
{ \
a-=e; f^=h>>9; h+=a; \
b-=f; g^=a<<9; a+=b; \
c-=g; h^=b>>23; b+=c; \
d-=h; a^=c<<15; c+=d; \
e-=a; b^=d>>14; d+=e; \
f-=b; c^=e<<20; e+=f; \
g-=c; d^=f>>17; f+=g; \
h-=d; e^=g<<14; g+=h; \
}

void rand64init(rand64ctx *ctx, word flag)
{
word i;
ub8 a,b,c,d,e,f,g,h;
ub8 *mm, *randrsl;
ctx->aa = ctx->bb = ctx->cc = (ub8)0;
mm=ctx->mm;
randrsl=ctx->randrsl;
a=b=c=d=e=f=g=h=0x9e3779b97f4a7c13LL; /* the golden ratio */

for (i=0; i<4; ++i) /* scramble it */
{
mix(a,b,c,d,e,f,g,h);
}

for (i=0; i<RANDSIZ; i+=8) /* fill in mm[] with messy stuff */
{
if (flag) /* use all the information in the seed */
{
a+=randrsl[i ]; b+=randrsl[i+1]; c+=randrsl[i+2]; d+=randrsl[i+3];
e+=randrsl[i+4]; f+=randrsl[i+5]; g+=randrsl[i+6]; h+=randrsl[i+7];
}
mix(a,b,c,d,e,f,g,h);
mm[i ]=a; mm[i+1]=b; mm[i+2]=c; mm[i+3]=d;
mm[i+4]=e; mm[i+5]=f; mm[i+6]=g; mm[i+7]=h;
}

if (flag)
{ /* do a second pass to make all of the seed affect all of mm */
for (i=0; i<RANDSIZ; i+=8)
{
a+=mm[i ]; b+=mm[i+1]; c+=mm[i+2]; d+=mm[i+3];
e+=mm[i+4]; f+=mm[i+5]; g+=mm[i+6]; h+=mm[i+7];
mix(a,b,c,d,e,f,g,h);
mm[i ]=a; mm[i+1]=b; mm[i+2]=c; mm[i+3]=d;
mm[i+4]=e; mm[i+5]=f; mm[i+6]=g; mm[i+7]=h;
}
}

isaac64(ctx); /* fill in the first set of results */
ctx->randcnt=RANDSIZ; /* prepare to use the first set of results */
}

#ifdef NEVER
int main()
{
ub8 i,j;
rand64ctx ctx;
ctx.aa=ctx.bb=ctx.cc=(ub8)0;
for (i=0; i<RANDSIZ; ++i) ctx.mm[i]=(ub8)0;
rand64init(&ctx, TRUE);
for (i=0; i<2; ++i)
{
isaac64(&ctx);
for (j=0; j<RANDSIZ; ++j)
{
printf("%.8lx%.8lx",(ub4)(ctx.randrsl[j]>>32),(ub4)ctx.randrsl[j]);
if ((j&3)==3) printf("\n");
}
}
}
#endif
41 changes: 41 additions & 0 deletions src/isaac_rand/isaac64.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
------------------------------------------------------------------------------
isaac64.h: definitions for a random number generator
Bob Jenkins, 1996, Public Domain
------------------------------------------------------------------------------
*/
#ifndef ISAAC64
#define ISAAC64

#include "isaac_standard.h"

struct rand64ctx
{
ub8 randrsl[RANDSIZ], randcnt;
ub8 mm[RANDSIZ];
ub8 aa, bb, cc;
};
typedef struct rand64ctx rand64ctx;

/*
------------------------------------------------------------------------------
If (flag==TRUE), then use the contents of randrsl[0..255] as the seed.
------------------------------------------------------------------------------
*/
void rand64init(rand64ctx *r, word flag);

void isaac64(rand64ctx *ctx);


/*
------------------------------------------------------------------------------
Call rand64() to retrieve a single 64-bit random value
------------------------------------------------------------------------------
*/
#define isaac64_rand() \
(!(r)->randcnt-- ? \
(isaac64(r), (r)->randcnt=RANDSIZ-1, (r)->randrsl[(r)->>randcnt]) : \
(r)->randrsl[(r)->randcnt])

#endif /* ISAAC64 */

8 changes: 2 additions & 6 deletions src/isaac_rand/isaac_rand.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ By Bob Jenkins, 1996, Public Domain
010626: note this is public domain
------------------------------------------------------------------------------
*/
#ifndef STANDARD
#include "isaac_standard.h"
#endif

#ifndef RAND
#define RAND
#define RANDSIZL (4) /* I recommend 8 for crypto, 4 for simulations */
#define RANDSIZ (1<<RANDSIZL)

#include "isaac_standard.h"

/* context of random number generator */
struct randctx
Expand Down
3 changes: 3 additions & 0 deletions src/isaac_rand/isaac_standard.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,7 @@ typedef int word; /* fastest type available */
#define FALSE 0
#define SUCCESS 0 /* 1 on VAX */

#define RANDSIZL (8) /* I recommend 8 for crypto, 4 for simulations */
#define RANDSIZ (1<<RANDSIZL)

#endif /* STANDARD */
3 changes: 2 additions & 1 deletion src/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ int nwipe_options_parse( int argc, char** argv )

extern nwipe_prng_t nwipe_twister;
extern nwipe_prng_t nwipe_isaac;
extern nwipe_prng_t nwipe_isaac64;

/* The getopt() result holder. */
int nwipe_opt;
Expand Down Expand Up @@ -118,7 +119,7 @@ int nwipe_options_parse( int argc, char** argv )
nwipe_options.autonuke = 0;
nwipe_options.autopoweroff = 0;
nwipe_options.method = &nwipe_dodshort;
nwipe_options.prng = &nwipe_twister;
nwipe_options.prng = ( sizeof( unsigned long int ) >= 8 ) ? &nwipe_isaac64 : &nwipe_isaac;
nwipe_options.rounds = 1;
nwipe_options.noblank = 0;
nwipe_options.nousb = 0;
Expand Down
Loading

0 comments on commit d964c92

Please sign in to comment.