Skip to contentSkip to conversation

Remove the --disable-eurephia configure option

PATCH In review David Sommerseth 2 participants 3 messages Jun 7, 2013 – Jul 3, 2013

lore
Share & tools
lore

David Sommerseth

author
#0 lore raw

PATCH 2/3 Remove the --disable-eurephia configure option

From: David Sommerseth <[email protected]...>

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 <[email protected]...>
---
 INSTALL                  |    2 --
 configure.ac             |    8 --------
 src/openvpn/options.c    |    7 +------
 src/openvpn/ssl.c        |    5 +----
 src/openvpn/ssl_verify.c |    2 --
 5 files changed, 2 insertions(+), 22 deletions(-)
INSTALL +0 -2
index ed69667..61dc975 100644
@@ -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]
configure.ac +0 -8
index 5da5772..b1dd30e 100644
@@ -101,13 +101,6 @@ AC_ARG_ENABLE(
 )
 
 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"
src/openvpn/options.c +1 -6
index 8975bbc..500ae75 100644
@@ -6,9 +6,7 @@
  *             packet compression.
  *
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...>
- *
- *  Additions for eurephia plugin done by:
- *         David Sommerseth <[email protected]...> Copyright (C) 2009
+ *  Copyright (C) 2008-2013 David Sommerseth <[email protected]...>
  *
  *  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
src/openvpn/ssl.c +1 -4
index d9076f3..657d31f 100644
@@ -7,10 +7,7 @@
  *
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...>
  *  Copyright (C) 2010 Fox Crypto B.V. <[email protected]...>
- *
- *  Additions for eurephia plugin done by:
- *         David Sommerseth <[email protected]...> Copyright (C) 2008-2009
- *
+ *  Copyright (C) 2008-2013 David Sommerseth <[email protected]...>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
src/openvpn/ssl_verify.c +0 -2
index e651a8e..0670f2a 100644
@@ -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);
Signature · 1 line
1.7.10.2
#1 lore raw

Hi,

Quoted 8 lines · David Sommerseth

From: David Sommerseth <[email protected]...>

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.

ACK.

I'd say this is good for 2.3.3 and 2.4.

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#2 lore raw
In reply to David Sommerseth

Your patch has been applied to the master and release/2.3 branches.

commit e3d388652f59fd2ddd9c7f470f7ef62ee6b35595 (master) commit 14566e4374229c39db96d60a88ffecc17273efa3 (release/2.3)

Author: David Sommerseth
Date:   Fri Jun 7 12:15:23 2013 +0200
     Remove the --disable-eurephia configure option

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/7660
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering