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@

1 files changed, 1 insertions, 3 deletions

diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index 0a02c910d9..c9419ee7a7 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.13 2015/09/11 18:07:06 beck Exp $ */
+/* $OpenBSD: ca.c,v 1.14 2015/09/12 19:34:07 lteo Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -497,8 +497,6 @@ bad:
         tofree = NULL;
         if (configfile == NULL)
                 configfile = getenv("OPENSSL_CONF");
-        if (configfile == NULL)
-                configfile = getenv("SSLEAY_CONF");
         if (configfile == NULL) {
                 if ((tofree = make_config_name()) == NULL) {
                         BIO_printf(bio_err, "error making config file name\n");