more spring VMS cleanup

ok miod@ lteo@

diff --git a/lib/libcrypto/conf/conf_def.c b/lib/libcrypto/conf/conf_def.c
index 32d4745..39e8b8e 100644 (file)
--- a/lib/libcrypto/conf/conf_def.c
+++ b/lib/libcrypto/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/libcrypto/conf/conf_lib.c b/lib/libcrypto/conf/conf_lib.c
index 54046de..6f8866f 100644 (file)
--- a/lib/libcrypto/conf/conf_lib.c
+++ b/lib/libcrypto/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/libcrypto/conf/conf_mod.c b/lib/libcrypto/conf/conf_mod.c
index 652ad64..ca7b5e6 100644 (file)
--- a/lib/libcrypto/conf/conf_mod.c
+++ b/lib/libcrypto/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;

diff --git a/lib/libssl/src/crypto/conf/conf_def.c b/lib/libssl/src/crypto/conf/conf_def.c
index 32d4745..39e8b8e 100644 (file)
--- 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 54046de..6f8866f 100644 (file)
--- 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 652ad64..ca7b5e6 100644 (file)
--- 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;