diff options
| author | Giovanni Bechis <giovanni@cvs.openbsd.org> | 2014-04-17 22:09:38 +0000 |
|---|---|---|
| committer | Giovanni Bechis <giovanni@cvs.openbsd.org> | 2014-04-17 22:09:38 +0000 |
| commit | 8d61a10ba2840584d52152e31a6b681bf2085875 (patch) | |
| tree | f78b091f8b24d968f9d08934b7f2fff168a6ea91 /lib/libcrypto/conf | |
| parent | cba11444aba6d3e89c1efd8263d49279dea1f7a5 (diff) | |
more spring VMS cleanup
ok miod@ lteo@
Diffstat (limited to 'lib/libcrypto/conf')
| -rw-r--r-- | lib/libcrypto/conf/conf_def.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/conf/conf_lib.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/conf/conf_mod.c | 6 |
3 files changed, 0 insertions, 14 deletions
diff --git a/lib/libcrypto/conf/conf_def.c b/lib/libcrypto/conf/conf_def.c index 32d47458a0d..39e8b8e5210 100644 --- 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 54046defca8..6f8866fa1ac 100644 --- 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 652ad6469a7..ca7b5e697a9 100644 --- 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; |