security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-21 19:48:05 +01:00
Code Activity

Remove trailing white space from one file

Browse Source 
--
This commit is contained in:
Werner Koch 2012-11-07 18:00:45 +01:00
parent 6a41f385c4
commit a74f05c32d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cipher/random.c
View File

@ -155,7 +155,7 @@ getfnc_gather_random (void))(void (*)(const void*, size_t, int), int,
{ {
#ifdef USE_ALL_RANDOM_MODULES #ifdef USE_ALL_RANDOM_MODULES
static int (*fnc)(void (*)(const void*, size_t, int), int, size_t, int); static int (*fnc)(void (*)(const void*, size_t, int), int, size_t, int);
if (fnc) if (fnc)
return fnc; return fnc;
# ifdef USE_RNDLINUX # ifdef USE_RNDLINUX
@ -231,7 +231,7 @@ static void
burn_stack (int bytes) burn_stack (int bytes)
{ {
char buf[128]; char buf[128];
wipememory(buf,sizeof buf); wipememory(buf,sizeof buf);
bytes -= sizeof buf; bytes -= sizeof buf;
if (bytes > 0) if (bytes > 0)
@ -293,7 +293,7 @@ random_is_faked()
} }
/* Disable locking of seed files. */ /* Disable locking of seed files. */
void void
random_disable_locking () random_disable_locking ()
{ {
no_seed_file_locking = 1; no_seed_file_locking = 1;
@ -401,7 +401,7 @@ lock_seed_file (int fd, const char *fname, int for_write)
if (no_seed_file_locking) if (no_seed_file_locking)
return 0; return 0;
/* We take a lock on the entire file. */ /* We take a lock on the entire file. */
memset (&lck, 0, sizeof lck); memset (&lck, 0, sizeof lck);
lck.l_type = for_write? F_WRLCK : F_RDLCK; lck.l_type = for_write? F_WRLCK : F_RDLCK;
@ -417,7 +417,7 @@ lock_seed_file (int fd, const char *fname, int for_write)
if (backoff > 2) /* Show the first message after ~3.75 seconds. */ if (backoff > 2) /* Show the first message after ~3.75 seconds. */
log_info( _("waiting for lock on `%s'...\n"), fname); log_info( _("waiting for lock on `%s'...\n"), fname);
tv.tv_sec = backoff; tv.tv_sec = backoff;
tv.tv_usec = 250000; tv.tv_usec = 250000;
select (0, NULL, NULL, NULL, &tv); select (0, NULL, NULL, NULL, &tv);
@ -569,10 +569,10 @@ update_random_seed_file()
seed_file_name, strerror (errno)); seed_file_name, strerror (errno));
return; return;
} }
if (backoff > 2) /* Show the first message after ~3.75 seconds. */ if (backoff > 2) /* Show the first message after ~3.75 seconds. */
log_info( _("waiting for lock on `%s'...\n"), seed_file_name); log_info( _("waiting for lock on `%s'...\n"), seed_file_name);
wait_vms( backoff+ 0.25); wait_vms( backoff+ 0.25);
if (backoff < 10) if (backoff < 10)
backoff++ ; backoff++ ;
@ -766,7 +766,7 @@ fast_random_poll()
/* fall back to the generic function */ /* fall back to the generic function */
#if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME) #if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME)
{ hrtime_t tv; { hrtime_t tv;
/* On some Solaris and HPUX system gethrtime raises an SIGILL, but we /* On some Solaris and HPUX system gethrtime raises an SIGILL, but we
* checked this with configure */ * checked this with configure */
tv = gethrtime(); tv = gethrtime();
add_randomness( &tv, sizeof(tv), 1 ); add_randomness( &tv, sizeof(tv), 1 );
@ -801,11 +801,11 @@ fast_random_poll()
{ struct rusage buf; { struct rusage buf;
/* QNX/Neutrino does return ENOSYS - so we just ignore it and /* QNX/Neutrino does return ENOSYS - so we just ignore it and
* add whatever is in buf. In a chroot environment it might not * add whatever is in buf. In a chroot environment it might not
* work at all (i.e. because /proc/ is not accessible), so we better * work at all (i.e. because /proc/ is not accessible), so we better
* ignore all error codes and hope for the best * ignore all error codes and hope for the best
*/ */
getrusage( RUSAGE_SELF, &buf ); getrusage( RUSAGE_SELF, &buf );
add_randomness( &buf, sizeof buf, 1 ); add_randomness( &buf, sizeof buf, 1 );
wipememory( &buf, sizeof buf ); wipememory( &buf, sizeof buf );
} }