1 files changed, 22 insertions, 48 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index d108353bbc..005cb38cb0 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -81,25 +81,10 @@
 # include <sys/stat.h>
 #endif
 
-#ifdef _WIN32
-#define stat    _stat
-#define chmod   _chmod
-#define open    _open
-#define fdopen  _fdopen
-#endif
-
 #undef BUFSIZE
 #define BUFSIZE 1024
 #define RAND_DATA 1024
 
-#ifdef OPENSSL_SYS_VMS
-/* This declaration is a nasty hack to get around vms' extension to fopen
- * for passing in sharing options being disabled by our /STANDARD=ANSI89 */
-static FILE *(*const vms_fopen)(const char *, const char *, ...) =
-    (FILE *(*)(const char *, const char *, ...))fopen;
-#define VMS_OPEN_ATTRS "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0"
-#endif
-
 /* #define RFILE ".rnd" - defined in ../../e_os.h */
 
 /* Note that these functions are intended for seed files only.
@@ -121,11 +106,7 @@ int RAND_load_file(const char *file, long bytes)
         RAND_add(&sb,sizeof(sb),0.0);
         if (bytes == 0) return(ret);
 
-#ifdef OPENSSL_SYS_VMS
-        in=vms_fopen(file,"rb",VMS_OPEN_ATTRS);
-#else
         in=fopen(file,"rb");
-#endif
         if (in == NULL) goto err;
 #if defined(S_IFBLK) && defined(S_IFCHR)
         if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
@@ -186,7 +167,7 @@ int RAND_write_file(const char *file)
 #endif
         }
 
-#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_VMS)
+#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
         {
         /* For some reason Win32 can't write to files created this way */
         
@@ -197,34 +178,8 @@ int RAND_write_file(const char *file)
                 out = fdopen(fd, "wb");
         }
 #endif
-
-#ifdef OPENSSL_SYS_VMS
-        /* VMS NOTE: Prior versions of this routine created a _new_
-         * version of the rand file for each call into this routine, then
-         * deleted all existing versions named ;-1, and finally renamed
-         * the current version as ';1'. Under concurrent usage, this
-         * resulted in an RMS race condition in rename() which could
-         * orphan files (see vms message help for RMS$_REENT). With the
-         * fopen() calls below, openssl/VMS now shares the top-level
-         * version of the rand file. Note that there may still be
-         * conditions where the top-level rand file is locked. If so, this
-         * code will then create a new version of the rand file. Without
-         * the delete and rename code, this can result in ascending file
-         * versions that stop at version 32767, and this routine will then
-         * return an error. The remedy for this is to recode the calling
-         * application to avoid concurrent use of the rand file, or
-         * synchronize usage at the application level. Also consider
-         * whether or not you NEED a persistent rand file in a concurrent
-         * use situation. 
-         */
-
-        out = vms_fopen(file,"rb+",VMS_OPEN_ATTRS);
-        if (out == NULL)
-                out = vms_fopen(file,"wb",VMS_OPEN_ATTRS);
-#else
         if (out == NULL)
                 out = fopen(file,"wb");
-#endif
         if (out == NULL) goto err;
 
 #ifndef NO_CHMOD
@@ -246,6 +201,25 @@ int RAND_write_file(const char *file)
                 ret+=i;
                 if (n <= 0) break;
                 }
+#ifdef OPENSSL_SYS_VMS
+        /* Try to delete older versions of the file, until there aren't
+           any */
+        {
+        char *tmpf;
+
+        tmpf = OPENSSL_malloc(strlen(file) + 4);  /* to add ";-1" and a nul */
+        if (tmpf)
+                {
+                strcpy(tmpf, file);
+                strcat(tmpf, ";-1");
+                while(delete(tmpf) == 0)
+                        ;
+                rename(file,";1"); /* Make sure it's version 1, or we
+                                      will reach the limit (32767) at
+                                      some point... */
+                }
+        }
+#endif /* OPENSSL_SYS_VMS */
 
         fclose(out);
         OPENSSL_cleanse(buf,BUFSIZE);
@@ -261,7 +235,7 @@ const char *RAND_file_name(char *buf, size_t size)
         struct stat sb;
 #endif
 
-        if (OPENSSL_issetugid() == 0)
+        if (issetugid() == 0)
                 s=getenv("RANDFILE");
         if (s != NULL && *s && strlen(s) + 1 < size)
                 {
@@ -270,7 +244,7 @@ const char *RAND_file_name(char *buf, size_t size)
                 }
         else
                 {
-                if (OPENSSL_issetugid() == 0)
+                if (issetugid() == 0)
                         s=getenv("HOME");
 #ifdef DEFAULT_HOME
                 if (s == NULL)