diff options
| author | lteo <> | 2015-09-12 19:34:07 +0000 |
|---|---|---|
| committer | lteo <> | 2015-09-12 19:34:07 +0000 |
| commit | 4ba4f1781a267e49f79cabb109294a61d12f84a0 (patch) | |
| tree | 4ddf54d828aab78409ab1158c950cbbedb1d9d2e /src/usr.bin/openssl/ts.c | |
| parent | 5b7d466b6eec87df20f4bdebf660cec3c5c7a9a8 (diff) | |
| download | openbsd-4ba4f1781a267e49f79cabb109294a61d12f84a0.tar.gz openbsd-4ba4f1781a267e49f79cabb109294a61d12f84a0.tar.bz2 openbsd-4ba4f1781a267e49f79cabb109294a61d12f84a0.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 '')
| -rw-r--r-- | src/usr.bin/openssl/ts.c | 4 |
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)) || |
