[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  39aceac320a1561d50c7d71ac2560aec7ab8eddb (commit)
      from  341de5f1997d21b60cee69be656f1ae709bccdac (commit)


- Log -----------------------------------------------------------------
commit 39aceac320a1561d50c7d71ac2560aec7ab8eddb
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 23 01:45:04 2017 +0100

    On VMS, massage the fetch file names to remove the generation number
    
    The generation number is ';nnn' at the end of the file name fetched
    with readdir().  Because rehash checks for specific extensions and
    doesn't expect an additional generation number, the easiest is to
    massage the received file name early by simply removing the generation
    number.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2717)

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

Summary of changes:
 apps/rehash.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/rehash.c b/apps/rehash.c
index 7754112..e837d27 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -281,6 +281,24 @@ static int ends_with_dirsep(const char *path)
     return *path == '/';
 }
 
+static int massage_filename(char *name)
+{
+# ifdef __VMS
+    char *p = strchr(name, ';');
+    char *q = p;
+
+    if (q != NULL) {
+        for (q++; *q != '\0'; q++) {
+            if (!isdigit(*q))
+                return 1;
+        }
+    }
+
+    *p = '\0';
+# endif
+    return 1;
+}
+
 /*
  * Process a directory; return number of errors found.
  */
@@ -316,6 +334,7 @@ static int do_dir(const char *dirname, enum Hash h)
     }
     while ((filename = OPENSSL_DIR_read(&d, dirname)) != NULL) {
         if ((copy = strdup(filename)) == NULL
+                || !massage_filename(copy)
                 || sk_OPENSSL_STRING_push(files, copy) == 0) {
             BIO_puts(bio_err, "out of memory\n");
             exit(1);