[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c9c84a13916aa5c5c58912b49839e72fe82b23f5 (commit)
      from  5db6336dee6701ddfc3a234383e522295645c6b0 (commit)


- Log -----------------------------------------------------------------
commit c9c84a13916aa5c5c58912b49839e72fe82b23f5
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Fri Sep 25 13:51:27 2015 -0400

    GH408 follow-on: update buflen
    
    Some builds break, as documented in:
      https://github.com/openssl/openssl/pull/408#issuecomment-142971427
    This fixes it.
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/rehash.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/rehash.c b/apps/rehash.c
index dbaea10..e85265d 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -74,6 +74,9 @@
 # include <openssl/x509.h>
 
 
+# ifndef NAME_MAX
+#  define NAME_MAX 255
+# endif
 # define MAX_COLLISIONS  256
 
 typedef struct hentry_st {
@@ -319,7 +322,8 @@ static int do_dir(const char *dirname, enum Hash h)
     }
     buflen = strlen(dirname);
     pathsep = (buflen && dirname[buflen - 1] == '/') ? "" : "/";
-    buf = app_malloc(PATH_MAX, "filename buffer");
+    buflen += NAME_MAX + 1 + 1;
+    buf = app_malloc(buflen, "filename buffer");
 
     if (verbose)
         BIO_printf(bio_out, "Doing %s\n", dirname);