oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix conflicts.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@545 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1996-05-29 23:14:17 +00:00
parent caca84e6ad
commit 7434b7feef
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/des/rnd_keys.c
View File

@@ -111,7 +111,10 @@ sigALRM(int sig)
SIGRETURN(0); SIGRETURN(0);
} }
#if 0 /* Somehow use this when/if neccessary?/bg */ #if !definded(HAVE_SETITIMER) && defined(HAVE_RANDOM)
/* XXX this is a quick hack, should be fixed */
static static
void void
des_rand_data(unsigned char *data, int size) des_rand_data(unsigned char *data, int size)
@@ -121,7 +124,8 @@ des_rand_data(unsigned char *data, int size)
for(i = 0; i < size; ++i) for(i = 0; i < size; ++i)
data[i] = random() % 0x100; data[i] = random() % 0x100;
} }
#endif
#else
/* /*
* Generate size bytes of "random" data using timed interrupts. * Generate size bytes of "random" data using timed interrupts.
@@ -176,6 +180,7 @@ des_rand_data(unsigned char *data, int size)
setitimer(ITIMER_REAL, &otv, 0); setitimer(ITIMER_REAL, &otv, 0);
sigaction(SIGALRM, &osa, 0); sigaction(SIGALRM, &osa, 0);
} }
#endif
void void
des_generate_random_block(des_cblock *block) des_generate_random_block(des_cblock *block)