commit 8846d7b3c35745f5ecc053f650dd76d3750d7ce5
author Bob Beck <bbe@google.com> Thu Feb 09 08:54:39 2023 -0700
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 09 16:37:21 2023 +0000
tree e6fea7e1ff7784d6135bca3be95deb2c95b27f69
parent 04b3a96452b57f74f9768b1126f35b7398ddfff3

VMS? I don't think so. Take this for a walk behind the barn.

Change-Id: Ia7518c6eeb87f21bbcb88d3b688745d07e963662
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57085
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>

crypto/x509/by_dir.c

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index b959bb8..3ad8128 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -319,29 +319,8 @@
         hent = NULL;
       }
       for (;;) {
-        char c = '/';
-#ifdef OPENSSL_SYS_VMS
-        c = ent->dir[strlen(ent->dir) - 1];
-        if (c != ':' && c != '>' && c != ']') {
-          // If no separator is present, we assume the directory
-          // specifier is a logical name, and add a colon.  We
-          // really should use better VMS routines for merging
-          // things like this, but this will do for now... --
-          // Richard Levitte
-          c = ':';
-        } else {
-          c = '\0';
-        }
-#endif
-        if (c == '\0') {
-          // This is special.  When c == '\0', no directory
-          // separator should be added.
-          BIO_snprintf(b->data, b->max, "%s%08lx.%s%d", ent->dir, h, postfix,
-                       k);
-        } else {
-          BIO_snprintf(b->data, b->max, "%s%c%08lx.%s%d", ent->dir, c, h,
-                       postfix, k);
-        }
+        BIO_snprintf(b->data, b->max, "%s/%08lx.%s%d", ent->dir, h, postfix,
+                     k);
 #ifndef OPENSSL_NO_POSIX_IO
 #if defined(_WIN32) && !defined(stat)
 #define stat _stat