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@

4 files changed, 5 insertions, 14 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");
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 7e4937207d..efa264fc9d 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.22 2015/09/11 14:30:23 bcook Exp $
+.\" $OpenBSD: openssl.1,v 1.23 2015/09/12 19:34:07 lteo Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: September 11 2015 $
+.Dd $Mdocdate: September 12 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -5779,9 +5779,6 @@ if defined, allows an alternative configuration
 file location to be specified; it will be overridden by the
 .Fl config
 command line switch if it is present.
-For compatibility reasons the
-.Ev SSLEAY_CONF
-environment variable serves the same purpose but its use is discouraged.
 .Sh REQ BUGS
 .Nm OpenSSL Ns Li 's
 handling of T61Strings
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 0361d1cbb4..653329f7c6 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.8 2015/09/11 20:55:59 jsing Exp $ */
+/* $OpenBSD: openssl.c,v 1.9 2015/09/12 19:34:07 lteo Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -455,8 +455,6 @@ main(int argc, char **argv)
 
         /* Lets load up our environment a little */
         p = getenv("OPENSSL_CONF");
-        if (p == NULL)
-                p = getenv("SSLEAY_CONF");
         if (p == NULL) {
                 p = to_free = make_config_name();
                 if (p == NULL) {
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 @@
-/* $OpenBSD: ts.c,v 1.6 2015/09/11 14:30:23 bcook Exp $ */
+/* $OpenBSD: ts.c,v 1.7 2015/09/12 19:34:07 lteo Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -347,8 +347,6 @@ load_config_file(const char *configfile)
 
         if (!configfile)
                 configfile = getenv("OPENSSL_CONF");
-        if (!configfile)
-                configfile = getenv("SSLEAY_CONF");
 
         if (configfile &&
             (!(conf = NCONF_new(NULL)) ||