From b8f304f70df820edb7740abcac31ed90073f3ecd Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 20 Jun 2016 07:56:32 +0200 Subject: [PATCH] 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: Matt Caswell Reviewed-by: Andy Polyakov --- CHANGES | 4 ++-- crypto/rand/randfile.c | 8 +++----- e_os.h | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 8fa6f44e0f..e182b6072f 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 19cce2c7a8..87cb6c013b 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -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) diff --git a/e_os.h b/e_os.h index 4951335635..eafa8623aa 100644 --- a/e_os.h +++ b/e_os.h @@ -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 -- 2.34.1