Merged libstrongswan options into charon section

2014-03-15 14:07:34 +01:00
parent f2a3a01134
commit c683b389ba
98 changed files with 41 additions and 240 deletions
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -4,8 +4,5 @@ charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown

  fragment_size = 1024
-}
-
-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -4,8 +4,5 @@ charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown

  fragment_size = 1024
-}
-
-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,11 +2,10 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 ntru revocation hmac stroke kernel-netlink socket-default updown
+
  multiple_authentication = no
  send_vendor_id = yes
-}

-libstrongswan {
  plugins {
    ntru {
      parameter_set = optimum
@@ -2,8 +2,6 @@

 charon {
  load = aes des sha1 sha2 md5 gmp random nonce hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = aes des sha1 sha2 md5 gmp random nonce hmac stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,9 +2,7 @@

 charon {
  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default unity
+  
  cisco_unity = yes
-}
-
-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,14 +2,13 @@

 charon {
  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default attr unity
+
  cisco_unity = yes
+  dh_exponent_ansi_x9_42 = no
+
  plugins {
    attr {
      split-exclude = 192.168.0.0/24
    }
  }
 }
-
-libstrongswan {
-  dh_exponent_ansi_x9_42 = no
-}
@@ -2,11 +2,10 @@

 charon {
  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
  integrity_test = yes
+
  crypto_test {
    on_add = yes
  }
@@ -2,11 +2,10 @@

 charon {
  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
  integrity_test = yes
+
  crypto_test {
    on_add = yes
  }
@@ -2,11 +2,10 @@

 charon {
  load = curl test-vectors aes des sha1 sha2 md5 pem pkcs1 pkcs8 gmp random nonce x509 revocation hmac xcbc ctr ccm gcm stroke kernel-netlink socket-default updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
  integrity_test = yes
+
  crypto_test {
    on_add = yes
  }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic resolve kernel-netlink socket-default stroke updown
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic resolve kernel-netlink socket-default stroke updown
-}
-
-libstrongswan {
+  
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,10 +2,8 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic attr kernel-netlink socket-default stroke updown
+
  dns1 = 192.168.0.150
  dns2 = 10.1.0.20
-}
-
-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac gmp random nonce xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,6 +2,9 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default fips-prf eap-radius eap-md5 xauth-eap updown
+
+  dh_exponent_ansi_x9_42 = no
+
  plugins {
    eap-radius {
      secret = gv6URkSs 
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,6 +2,9 @@

 charon {
  load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default fips-prf eap-radius updown
+
+  dh_exponent_ansi_x9_42 = no
+
  plugins {
    eap-radius {
      secret = gv6URkSs
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }
@@ -2,8 +2,6 @@

 charon {
  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation gmp random nonce curl xauth-generic kernel-netlink socket-default updown stroke
-}

-libstrongswan {
  dh_exponent_ansi_x9_42 = no
 }