summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Bechis <giovanni@cvs.openbsd.org>2014-04-17 22:09:38 +0000
committerGiovanni Bechis <giovanni@cvs.openbsd.org>2014-04-17 22:09:38 +0000
commit57c6efa961fe4ffd96c256883fb0f7ab5e7c0628 (patch)
treea5155f05781b8e3e842780d7dd17d8d85d31bd05
parent2d1a3a13ef4d8dab21e31d80c8194c72bfba8093 (diff)
more spring VMS cleanup
ok miod@ lteo@
-rw-r--r--lib/libssl/src/crypto/conf/conf_def.c4
-rw-r--r--lib/libssl/src/crypto/conf/conf_lib.c4
-rw-r--r--lib/libssl/src/crypto/conf/conf_mod.c6
3 files changed, 0 insertions, 14 deletions
diff --git a/lib/libssl/src/crypto/conf/conf_def.c b/lib/libssl/src/crypto/conf/conf_def.c
index 32d47458a0d..39e8b8e5210 100644
--- a/lib/libssl/src/crypto/conf/conf_def.c
+++ b/lib/libssl/src/crypto/conf/conf_def.c
@@ -186,11 +186,7 @@ static int def_load(CONF *conf, const char *name, long *line)
int ret;
BIO *in=NULL;
-#ifdef OPENSSL_SYS_VMS
- in=BIO_new_file(name, "r");
-#else
in=BIO_new_file(name, "rb");
-#endif
if (in == NULL)
{
if (ERR_GET_REASON(ERR_peek_last_error()) == BIO_R_NO_SUCH_FILE)
diff --git a/lib/libssl/src/crypto/conf/conf_lib.c b/lib/libssl/src/crypto/conf/conf_lib.c
index 54046defca8..6f8866fa1ac 100644
--- a/lib/libssl/src/crypto/conf/conf_lib.c
+++ b/lib/libssl/src/crypto/conf/conf_lib.c
@@ -93,11 +93,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
LHASH_OF(CONF_VALUE) *ltmp;
BIO *in=NULL;
-#ifdef OPENSSL_SYS_VMS
- in=BIO_new_file(file, "r");
-#else
in=BIO_new_file(file, "rb");
-#endif
if (in == NULL)
{
CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
diff --git a/lib/libssl/src/crypto/conf/conf_mod.c b/lib/libssl/src/crypto/conf/conf_mod.c
index 652ad6469a7..ca7b5e697a9 100644
--- a/lib/libssl/src/crypto/conf/conf_mod.c
+++ b/lib/libssl/src/crypto/conf/conf_mod.c
@@ -553,9 +553,6 @@ char *CONF_get1_default_config_file(void)
return BUF_strdup(file);
len = strlen(X509_get_default_cert_area());
-#ifndef OPENSSL_SYS_VMS
- len++;
-#endif
len += strlen(OPENSSL_CONF);
file = malloc(len + 1);
@@ -563,9 +560,6 @@ char *CONF_get1_default_config_file(void)
if (!file)
return NULL;
BUF_strlcpy(file,X509_get_default_cert_area(),len + 1);
-#ifndef OPENSSL_SYS_VMS
- BUF_strlcat(file,"/",len + 1);
-#endif
BUF_strlcat(file,OPENSSL_CONF,len + 1);
return file;