1. openvpn
  2. Commit 14566e4374229c39db96d60a88ffecc17273efa3
Browse code

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>
(cherry picked from commit e3d388652f59fd2ddd9c7f470f7ef62ee6b35595)

David Sommerseth authored on 2013/06/07 19:15:23
Showing 5 changed files
INSTALL
History View file @ 14566e4
... ... 
@@ -169,8 +169,6 @@ OPTIONS for ./configure:
169 169 
   --disable-server        disable server support only (but retain client
170 170 
                           support) [default=yes]
171 171 
   --disable-plugins       disable plug-in support [default=yes]
172 
-  --disable-eurephia      disable support for the eurephia plug-in
173 
-                          [default=yes]
174 172 
   --disable-management    disable management server support [default=yes]
175 173 
   --enable-pkcs11         enable pkcs11 support [default=no]
176 174 
   --disable-socks         disable Socks support [default=yes]
configure.ac
History View file @ 14566e4
... ... 
@@ -96,13 +96,6 @@ AC_ARG_ENABLE(
96 96 
 )
97 97
98 98 
 AC_ARG_ENABLE(
99 
-	[eurephia],
100 
-	[AS_HELP_STRING([--disable-eurephia], [disable support for the eurephia plug-in @<:@default=yes@:>@])],
101 
-	,
102 
-	[enable_eurephia="yes"]
103 
-)
104 
-
105 
-AC_ARG_ENABLE(
106 99 
 	[management],
107 100 
 	[AS_HELP_STRING([--disable-management], [disable management server support @<:@default=yes@:>@])],
108 101 
 	,
... ... 
@@ -975,7 +968,6 @@ fi
975 975 
 if test "${enable_plugins}" = "yes"; then
976 976 
 	OPTIONAL_DL_LIBS="${DL_LIBS}"
977 977 
 	AC_DEFINE([ENABLE_PLUGIN], [1], [Enable systemd support])
978 
-	test "${enable_eurephia}" = "yes" && AC_DEFINE([ENABLE_EUREPHIA], [1], [Enable support for the eurephia plug-in])
979 978 
 else
980 979 
 	enable_plugin_auth_pam="no"
981 980 
 	enable_plugin_down_root="no"
src/openvpn/options.c
History View file @ 14566e4
... ... 
@@ -6,9 +6,7 @@
6 6 
  *             packet compression.
7 7 
  *
8 8 
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
9 
- *
10 
- *  Additions for eurephia plugin done by:
11 
- *         David Sommerseth <dazo@users.sourceforge.net> Copyright (C) 2009
9 
+ *  Copyright (C) 2008-2013 David Sommerseth <dazo@users.sourceforge.net>
12 10 
  *
13 11 
  *  This program is free software; you can redistribute it and/or modify
14 12 
  *  it under the terms of the GNU General Public License version 2
... ... 
@@ -100,9 +98,6 @@ const char title_string[] =
100 100 
 #ifdef ENABLE_PKCS11
101 101 
   " [PKCS11]"
102 102 
 #endif
103 
-#ifdef ENABLE_EUREPHIA
104 
-  " [eurephia]"
105 
-#endif
106 103 
 #if ENABLE_IP_PKTINFO
107 104 
   " [MH]"
108 105 
 #endif
src/openvpn/ssl.c
History View file @ 14566e4
... ... 
@@ -7,10 +7,7 @@
7 7 
  *
8 8 
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
9 9 
  *  Copyright (C) 2010 Fox Crypto B.V. <openvpn@fox-it.com>
10 
- *
11 
- *  Additions for eurephia plugin done by:
12 
- *         David Sommerseth <dazo@users.sourceforge.net> Copyright (C) 2008-2009
13 
- *
10 
+ *  Copyright (C) 2008-2013 David Sommerseth <dazo@users.sourceforge.net>
14 11 
  *
15 12 
  *  This program is free software; you can redistribute it and/or modify
16 13 
  *  it under the terms of the GNU General Public License version 2
src/openvpn/ssl_verify.c
History View file @ 14566e4
... ... 
@@ -425,7 +425,6 @@ verify_cert_set_env(struct env_set *es, openvpn_x509_cert_t *peer_cert, int cert
425 425 
   setenv_str (es, envname, common_name);
426 426 
 #endif
427 427
428 
-#ifdef ENABLE_EUREPHIA
429 428 
   /* export X509 cert SHA1 fingerprint */
430 429 
   {
431 430 
     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
434 434 
     setenv_str (es, envname, format_hex_ex(sha1_hash, SHA_DIGEST_LENGTH, 0, 1,
435 435 
 					  ":", &gc));
436 436 
   }
437 
-#endif
438 437
439 438 
   /* export serial number as environmental variable */
440 439 
   serial = x509_get_serial(peer_cert, &gc);