merge openssl 0.9.6b-engine

Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index f4376cf8cc..2ffb84c89e 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -233,6 +233,12 @@ const char *RAND_file_name(char *buf, size_t size)
                 {
                 if (issetugid() == 0)
                         s=getenv("HOME");
+#ifdef DEFAULT_HOME
+                if (s == NULL)
+                        {
+                        s = DEFAULT_HOME;
+                        }
+#endif
                 if (s && *s && strlen(s)+strlen(RFILE)+2 < size)
                         {
                         strlcpy(buf,s,size);
@@ -242,7 +248,7 @@ const char *RAND_file_name(char *buf, size_t size)
                         strlcat(buf,RFILE,size);
                         ret=buf;
                         }
-                  else
+                else
                         buf[0] = '\0'; /* no file name */
                 }