1 files changed, 47 insertions, 8 deletions

diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 61a77dff11..a107b8c14a 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -83,6 +83,7 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
+#include <openssl/rand.h>
 #include <openssl/engine.h>
 #include "s_apps.h"
 
@@ -245,6 +246,7 @@ static void sv_usage(void)
         BIO_printf(bio_err," -bugs         - Turn on SSL bug compatibility\n");
         BIO_printf(bio_err," -www          - Respond to a 'GET /' with a status page\n");
         BIO_printf(bio_err," -WWW          - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
+        BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
         BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
         }
 
@@ -415,6 +417,8 @@ int MAIN(int argc, char *argv[])
         int no_tmp_rsa=0,no_dhe=0,nocert=0;
         int state=0;
         SSL_METHOD *meth=NULL;
+        char *inrand=NULL;
+        char *engine_id=NULL;
         ENGINE *e=NULL;
 #ifndef NO_DH
         DH *dh=NULL;
@@ -570,6 +574,11 @@ int MAIN(int argc, char *argv[])
                 else if (strcmp(*argv,"-tls1") == 0)
                         { meth=TLSv1_server_method(); }
 #endif
+                else if (strcmp(*argv,"-rand") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        inrand= *(++argv);
+                        }
                 else if (strcmp(*argv,"-engine") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ -591,7 +600,14 @@ bad:
                 goto end;
                 }
 
-        app_RAND_load_file(NULL, bio_err, 0);
+        if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
+                && !RAND_status())
+                {
+                BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                }
+        if (inrand != NULL)
+                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                        app_RAND_load_files(inrand));
 
         if (bio_s_out == NULL)
                 {
@@ -709,7 +725,8 @@ bad:
 
 #ifndef NO_RSA
 #if 1
-        SSL_CTX_set_tmp_rsa_callback(ctx,tmp_rsa_cb);
+        if (!no_tmp_rsa)
+                SSL_CTX_set_tmp_rsa_callback(ctx,tmp_rsa_cb);
 #else
         if (!no_tmp_rsa && SSL_CTX_need_tmp_RSA(ctx))
                 {
@@ -1369,15 +1386,29 @@ static int www_body(char *hostname, int s, unsigned char *context)
 
                         /* skip the '/' */
                         p= &(buf[5]);
-                        dot=0;
+
+                        dot = 1;
                         for (e=p; *e != '\0'; e++)
                                 {
-                                if (e[0] == ' ') break;
-                                if (    (e[0] == '.') &&
-                                        (strncmp(&(e[-1]),"/../",4) == 0))
-                                        dot=1;
+                                if (e[0] == ' ')
+                                        break;
+
+                                switch (dot)
+                                        {
+                                case 1:
+                                        dot = (e[0] == '.') ? 2 : 0;
+                                        break;
+                                case 2:
+                                        dot = (e[0] == '.') ? 3 : 0;
+                                        break;
+                                case 3:
+                                        dot = (e[0] == '/') ? -1 : 0;
+                                        break;
+                                        }
+                                if (dot == 0)
+                                        dot = (e[0] == '/') ? 1 : 0;
                                 }
-                        
+                        dot = (dot == 3) || (dot == -1); /* filename contains ".." component */
 
                         if (*e == '\0')
                                 {
@@ -1401,9 +1432,11 @@ static int www_body(char *hostname, int s, unsigned char *context)
                                 break;
                                 }
 
+#if 0
                         /* append if a directory lookup */
                         if (e[-1] == '/')
                                 strcat(p,"index.html");
+#endif
 
                         /* if a directory, do the index thang */
                         if (stat(p,&st_buf) < 0)
@@ -1415,7 +1448,13 @@ static int www_body(char *hostname, int s, unsigned char *context)
                                 }
                         if (S_ISDIR(st_buf.st_mode))
                                 {
+#if 0 /* must check buffer size */
                                 strcat(p,"/index.html");
+#else
+                                BIO_puts(io,text);
+                                BIO_printf(io,"'%s' is a directory\r\n",p);
+                                break;
+#endif
                                 }
 
                         if ((file=BIO_new_file(p,"r")) == NULL)