[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e7a68985d5b734890489a9d47f82210c384e8c3a (commit)
      from  1c9c243509d017244764545dc01e40d962423bbb (commit)


- Log -----------------------------------------------------------------
commit e7a68985d5b734890489a9d47f82210c384e8c3a
Author: Vladimir Kotal <Vladimir.Kotal at Oracle.COM>
Date:   Mon Sep 21 21:07:28 2015 +0200

    fix compilation on Solaris
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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

diff --git a/apps/rehash.c b/apps/rehash.c
index c8bfb05..dbaea10 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -199,7 +199,7 @@ static int handle_symlink(const char *filename, const char *fullpath)
     unsigned int hash = 0;
     int i, type, id;
     unsigned char ch;
-    char linktarget[NAME_MAX], *endptr;
+    char linktarget[PATH_MAX], *endptr;
     ssize_t n;
 
     for (i = 0; i < 8; i++) {
@@ -319,8 +319,7 @@ static int do_dir(const char *dirname, enum Hash h)
     }
     buflen = strlen(dirname);
     pathsep = (buflen && dirname[buflen - 1] == '/') ? "" : "/";
-    buflen += NAME_MAX + 2;
-    buf = app_malloc(buflen, "filename buffer");
+    buf = app_malloc(PATH_MAX, "filename buffer");
 
     if (verbose)
         BIO_printf(bio_out, "Doing %s\n", dirname);