Commit b8f304f7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change default directory for the .rnd file on Windows and VMS 



The previous change for Windows wasn't quite right.  Corrected to use
%HOME%, %USERPROFILE% and %SYSTEMPROFILE%, in that order.

Also adding the default home for VMS, SYS$LOGIN:

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent a8db2cfa

CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 














  *) The method for finding the storage location for the Windows RAND seed file















     has changed. First we check %RANDFILE%. If that is not set then we check













     the directories %TMP%, %TEMP%, %USERPROFILE%, %SYSTEMROOT% and %HOME% in













     that order. If all else fails we fall back to "C:".













     the directories %HOME%, %USERPROFILE% and %SYSTEMROOT% in that order. If













     all else fails we fall back to C:\.















     [Matt Caswell]





























  *) The EVP_EncryptUpdate() function has had its return type changed from void

































crypto/rand/randfile.c



+3
−5






























Original line number
Diff line number
Diff line








@@ -292,11 +292,9 @@ const char *RAND_file_name(char *buf, size_t size)













         * uses TCHARs, but getenv() gives us chars so its easier to do it this















         * way















         */













        if ((s = getenv("TMP")) == NULL













            && (s = getenv("TEMP")) == NULL













            && (s = getenv("USERPROFILE")) == NULL













            && (s = getenv("SYSTEMROOT")) == NULL) {













            s = getenv("HOME");













        if ((s = getenv("HOME")) == NULL













            && (s = getenv("USERPROFILE")) == NULL) {













            s = getenv("SYSTEMROOT");















        }















#else















        if (OPENSSL_issetugid() == 0)

































e_os.h



+2
−0






























Original line number
Diff line number
Diff line








@@ -325,6 +325,8 @@ extern FILE *_imp___iob;













#   define NO_SYS_PARAM_H















#   define NO_SYS_UN_H





























#   define DEFAULT_HOME "SYS$LOGIN:"





























#  else















     /* !defined VMS */















#   ifdef OPENSSL_UNISTD