summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Bechis <giovanni@cvs.openbsd.org>2014-04-17 21:31:28 +0000
committerGiovanni Bechis <giovanni@cvs.openbsd.org>2014-04-17 21:31:28 +0000
commit4238816d314ca1c00282dae135a7a4f8679b6e3c (patch)
tree0de64d5ec917aac199cfa69c1434e11072d78a1e
parenteced9cb2795ae2ffb49d90a849250c9d83753b9d (diff)
Some VMS and WIN32 cleanup
ok miod@ lteo@
-rw-r--r--lib/libcrypto/x509/by_dir.c33
1 files changed, 5 insertions, 28 deletions
diff --git a/lib/libcrypto/x509/by_dir.c b/lib/libcrypto/x509/by_dir.c
index bc603312752..9795b636204 100644
--- a/lib/libcrypto/x509/by_dir.c
+++ b/lib/libcrypto/x509/by_dir.c
@@ -337,35 +337,12 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
}
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. */
- (void) snprintf(b->data, b->max,
- "%s%08lx.%s%d", ent->dir, h,
- postfix, k);
- } else {
- (void) snprintf(b->data, b->max,
- "%s%c%08lx.%s%d", ent->dir, c, h,
- postfix, k);
- }
+
+ (void) snprintf(b->data, b->max,
+ "%s%c%08lx.%s%d", ent->dir, c, h,
+ postfix, k);
+
#ifndef OPENSSL_NO_POSIX_IO
-#ifdef _WIN32
-#define stat _stat
-#endif
{
struct stat st;
if (stat(b->data, &st) < 0)