summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/ts.c
diff options
context:
space:
mode:
authorlteo <>2015-09-12 19:34:07 +0000
committerlteo <>2015-09-12 19:34:07 +0000
commit8c6d0b14d21df96627f6b3ff8430f8b0e3921ea1 (patch)
tree4ddf54d828aab78409ab1158c950cbbedb1d9d2e /src/usr.bin/openssl/ts.c
parent9480ccd0f85763578f4bb5f1b4b39e98da340d0f (diff)
downloadopenbsd-8c6d0b14d21df96627f6b3ff8430f8b0e3921ea1.tar.gz
openbsd-8c6d0b14d21df96627f6b3ff8430f8b0e3921ea1.tar.bz2
openbsd-8c6d0b14d21df96627f6b3ff8430f8b0e3921ea1.zip
Nuke SSLEAY_CONF -- a backwards compatibility environment variable that
has been superseded by OPENSSL_CONF and discouraged from use for almost 16 years. "Definately ok" jsing@ "burn it" deraadt@ "Kill it with fire" miod@ "KILL IT WITH FIRE!!! BURN!!!!" beck@
Diffstat (limited to 'src/usr.bin/openssl/ts.c')
-rw-r--r--src/usr.bin/openssl/ts.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/ts.c b/src/usr.bin/openssl/ts.c
index e958d0aaff..258e636b03 100644
--- a/src/usr.bin/openssl/ts.c
+++ b/src/usr.bin/openssl/ts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts.c,v 1.6 2015/09/11 14:30:23 bcook Exp $ */ 1/* $OpenBSD: ts.c,v 1.7 2015/09/12 19:34:07 lteo Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -347,8 +347,6 @@ load_config_file(const char *configfile)
347 347
348 if (!configfile) 348 if (!configfile)
349 configfile = getenv("OPENSSL_CONF"); 349 configfile = getenv("OPENSSL_CONF");
350 if (!configfile)
351 configfile = getenv("SSLEAY_CONF");
352 350
353 if (configfile && 351 if (configfile &&
354 (!(conf = NCONF_new(NULL)) || 352 (!(conf = NCONF_new(NULL)) ||