Remove the --disable-eurephia configure option

This "feature" has been enabled since OpenVPN 2.2 without any reports that
this has been causing issues.  All it does is to add an extra environment
variable 'tls_digest_{n}' with the certificate SHA1 fingerprint/digest
hash.

Lets just simplify things by removing the possibility to disable this
environment variable.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1370600123-6029-1-git-send-email-dazo@users.sourceforge.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7660
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/INSTALL b/INSTALL
index ed696673afc86595f252c7eb5e50e76a4b745676..61dc9758b9ffc501f3f5a08bdd968ee698e1a737 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -169,8 +169,6 @@ OPTIONS for ./configure:
   --disable-server        disable server support only (but retain client
                           support) [default=yes]
   --disable-plugins       disable plug-in support [default=yes]
-  --disable-eurephia      disable support for the eurephia plug-in
-                          [default=yes]
   --disable-management    disable management server support [default=yes]
   --enable-pkcs11         enable pkcs11 support [default=no]
   --disable-socks         disable Socks support [default=yes]

diff --git a/configure.ac b/configure.ac
index 854cfbb8047f4787234779746ab1b370a5c6aa04..22947966217446b33498cf069d09c320c8c84a10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -100,13 +100,6 @@ AC_ARG_ENABLE(
        [enable_plugins="yes"]
 )
 
-AC_ARG_ENABLE(
-       [eurephia],
-       [AS_HELP_STRING([--disable-eurephia], [disable support for the eurephia plug-in @<:@default=yes@:>@])],
-       ,
-       [enable_eurephia="yes"]
-)
-
 AC_ARG_ENABLE(
        [management],
        [AS_HELP_STRING([--disable-management], [disable management server support @<:@default=yes@:>@])],
@@ -1020,7 +1013,6 @@ fi
 if test "${enable_plugins}" = "yes"; then
        OPTIONAL_DL_LIBS="${DL_LIBS}"
        AC_DEFINE([ENABLE_PLUGIN], [1], [Enable systemd support])
-       test "${enable_eurephia}" = "yes" && AC_DEFINE([ENABLE_EUREPHIA], [1], [Enable support for the eurephia plug-in])
 else
        enable_plugin_auth_pam="no"
        enable_plugin_down_root="no"

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 883136f187631caf49f357352bb9335059c5c66e..c7f992379dd23e00d467e920d93fc2db5891b65b 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -6,9 +6,7 @@
  *             packet compression.
  *
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
- *
- *  Additions for eurephia plugin done by:
- *         David Sommerseth <dazo@users.sourceforge.net> Copyright (C) 2009
+ *  Copyright (C) 2008-2013 David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
@@ -107,9 +105,6 @@ const char title_string[] =
 #ifdef ENABLE_PKCS11
   " [PKCS11]"
 #endif
-#ifdef ENABLE_EUREPHIA
-  " [eurephia]"
-#endif
 #if ENABLE_IP_PKTINFO
   " [MH]"
 #endif

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 736dfc95d6e425dd196292ee956759169e4a727d..2a1f4bc418ae00bae82356dc38bbe8f4f99c6e2c 100644 (file)
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -7,10 +7,7 @@
  *
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
  *  Copyright (C) 2010 Fox Crypto B.V. <openvpn@fox-it.com>
- *
- *  Additions for eurephia plugin done by:
- *         David Sommerseth <dazo@users.sourceforge.net> Copyright (C) 2008-2009
- *
+ *  Copyright (C) 2008-2013 David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index b1bbc96f1dcf6a20b44781f81f7ca9ef75989f27..4dd3aa2d8e11c06b27bf00ce836efac9fbc4b7f8 100644 (file)
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -425,7 +425,6 @@ verify_cert_set_env(struct env_set *es, openvpn_x509_cert_t *peer_cert, int cert
   setenv_str (es, envname, common_name);
 #endif
 
-#ifdef ENABLE_EUREPHIA
   /* export X509 cert SHA1 fingerprint */
   {
     unsigned char *sha1_hash = x509_get_sha1_hash(peer_cert, &gc);
@@ -434,7 +433,6 @@ verify_cert_set_env(struct env_set *es, openvpn_x509_cert_t *peer_cert, int cert
     setenv_str (es, envname, format_hex_ex(sha1_hash, SHA_DIGEST_LENGTH, 0, 1,
                                          ":", &gc));
   }
-#endif
 
   /* export serial number as environmental variable */
   serial = x509_get_serial(peer_cert, &gc);