security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Minor changes to help the VMS port

Browse source
This commit is contained in:
Werner Koch 2010-09-28 10:07:30 +00:00
parent 9921fb3a8c
commit aa29ba1689
19 changed files with 232 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cipher/ChangeLog
View file

@ -1,3 +1,15 @@
2010-09-28 Steven M. Schweda <sms@antinode.info> (wk)
Changes to help the VMS port. See
http://antinode.info/dec/sw/gnupg.html .
* random.c [__VMS]: Include rmsdef.h and vms.h.
(LOCK_SEED_FILE) [__VMS]: Set to 0.
(getfnc_gather_random) [USE_RNDVMS]: Call rndvms_gather_random.
(read_seed_file) [__VMS]: Allow reading by others.
(update_random_seed_file) [__VMS]: Use VMS specific open call.
* rand-internal.h (rndvms_gather_random): New.
2008-04-17 David Shaw <dshaw@jabberwocky.com>
* camellia-glue.c (selftest, camellia_get_info), cipher.c

51
cipher/random.c
View file

@ -63,13 +63,23 @@
#include "rand-internal.h"
#include "algorithms.h"
#ifdef __VMS
# include <rmsdef.h>
# include "vms.h"
#endif /* def __VMS */
#ifndef RAND_MAX /* for SunOS */
#define RAND_MAX 32767
#endif
/* 2008-03-31 SMS.
* VMS C RTL before V8.3 lacks byte-range file locking, but by default,
* a file opened for write access is not shared, so mutual exclusion can
* most generally be handled at the open(). */
/* Check whether we can lock the seed file read write. */
#if defined(HAVE_FCNTL) && defined(HAVE_FTRUNCATE) && !defined(HAVE_W32_SYSTEM)
#if defined(HAVE_FCNTL) && defined(HAVE_FTRUNCATE) \
&& !defined(HAVE_W32_SYSTEM) && !defined(__VMS)
#define LOCK_SEED_FILE 1
#else
#define LOCK_SEED_FILE 0
@ -177,6 +187,9 @@ getfnc_gather_random (void))(void (*)(const void*, size_t, int), int,
# ifdef USE_RNDUNIX
return rndunix_gather_random;
# endif
# ifdef USE_RNDVMS
return rndvms_gather_random;
# endif
# ifdef USE_RNDEGD
return rndegd_gather_random;
# endif
@ -402,7 +415,7 @@ lock_seed_file (int fd, const char *fname, int for_write)
return -1;
}
if (backoff > 2) /* Show the first message after ~2.25 seconds. */
if (backoff > 2) /* Show the first message after ~3.75 seconds. */
log_info( _("waiting for lock on `%s'...\n"), fname);
tv.tv_sec = backoff;
@ -434,6 +447,9 @@ read_seed_file(void)
#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__)
fd = open( seed_file_name, O_RDONLY | O_BINARY );
#elif defined( __VMS)
/* We're only reading, so allow others to do anything. */
fd = open( seed_file_name, O_RDONLY, 0777, "shr=get,put,upd" );
#else
fd = open( seed_file_name, O_RDONLY );
#endif
@ -535,11 +551,40 @@ update_random_seed_file()
# if LOCK_SEED_FILE
fd = open( seed_file_name, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR );
# else
# ifdef __VMS
/* Open the seed file for exclusive write access, but allow other
* readers. Loop until success. Complain after a few failures. */
{
int backoff = 0;
while ((fd = open( seed_file_name,
O_WRONLY|O_CREAT,
S_IRUSR|S_IWUSR,
"shr=get")) == -1 )
{
if ((errno != EVMSERR) || (vaxc$errno != RMS$_FLK))
{
/* Some unexpected open failure. */
log_info (_("can't lock `%s': %s\n"),
seed_file_name, strerror (errno));
return;
}
if (backoff > 2) /* Show the first message after ~3.75 seconds. */
log_info( _("waiting for lock on `%s'...\n"), seed_file_name);
wait_vms( backoff+ 0.25);
if (backoff < 10)
backoff++ ;
}
}
# else /* !def __VMS */
fd = open( seed_file_name, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR );
# endif /* !def __VMS */
# endif
#endif
if( fd == -1 ) {
log_info(_("can't create `%s': %s\n"), seed_file_name, strerror(errno) );
log_info(_("can't create `%s': %s\n"), seed_file_name, strerror(errno));
return;
}