summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2018-04-30 13:28:46 -0400
committerGitHub <noreply@github.com>2018-04-30 13:28:46 -0400
commit1022dc54bab9fa076fe3033a0c1e3f7f9549345d (patch)
treee6222adb76bae54ae9126fb5720d75e641db0e32 /pkgs/tools/networking
parentb405a6537c79a00f3d754dfd9b7a3b3ca467b4f0 (diff)
downloadnixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar.gz
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar.bz2
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar.lz
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar.xz
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.tar.zst
nixlib-1022dc54bab9fa076fe3033a0c1e3f7f9549345d.zip
strongswan: include curl plugin by default (#39506)
This is necessary for OCSP and/or remote CRL verification of server
certificates to work, which is a fairly common thing to need.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/strongswan/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 042f8bea3d62..eb466745ef84 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -3,11 +3,15 @@
 , gmp, python, iptables, ldns, unbound, openssl, pcsclite
 , openresolv
 , systemd, pam
-
-, enableTNC            ? false, curl, trousers, sqlite, libxml2
+, curl
+, enableTNC            ? false, trousers, sqlite, libxml2
 , enableNetworkManager ? false, networkmanager
 }:
 
+# Note on curl support: If curl is built with gnutls as its backend, the
+# strongswan curl plugin may break.
+# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info.
+
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
@@ -23,8 +27,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs =
-    [ gmp python iptables ldns unbound openssl pcsclite ]
-    ++ optionals enableTNC [ curl trousers sqlite libxml2 ]
+    [ curl gmp python iptables ldns unbound openssl pcsclite ]
+    ++ optionals enableTNC [ trousers sqlite libxml2 ]
     ++ optionals stdenv.isLinux [ systemd.dev pam ]
     ++ optionals enableNetworkManager [ networkmanager ];
 
@@ -61,12 +65,12 @@ stdenv.mkDerivation rec {
       "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
       "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
-      "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ]
+      "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly"
+      "--enable-curl" ]
     ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
     ++ optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
-         "--enable-curl"
          "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
          "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
          "--enable-tnc-imv" "--enable-imv-attestation"