diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-08-09 15:10:46 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-08-09 15:10:46 +0000 |
| commit | e404916e033ff354844fe7ac92fd395247d46cc4 (patch) | |
| tree | fe7fac30b1446ce9f604052e203d18f2e3f808f2 | |
| parent | 3ca1d6ddd701525ab93ff9fd73701b44081da053 (diff) | |
| download | initscripts-e404916e033ff354844fe7ac92fd395247d46cc4.tar initscripts-e404916e033ff354844fe7ac92fd395247d46cc4.tar.gz initscripts-e404916e033ff354844fe7ac92fd395247d46cc4.tar.bz2 initscripts-e404916e033ff354844fe7ac92fd395247d46cc4.tar.xz initscripts-e404916e033ff354844fe7ac92fd395247d46cc4.zip | |
add support for overriding IKE dh group (#251506, <stijn.tintel@x-tend.be>)
| -rw-r--r-- | sysconfig.txt | 3 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ipsec | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 19d329b3..0be8a84c 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -858,10 +858,11 @@ Files in /etc/sysconfig/network-scripts/ Automatic keying: + IKE_DHGROUP=<number> (defaults to 2) IKE_METHOD=PSK|X509|GSSAPI PSK=preshared keys (shared secret) X509=X.509 certificates - GSSAPI=GSSAPI authentication + GSSPI=GSSAPI authentication IKE_PSK=preshared key for this connection IKE_CERTFILE=our certificate file name for X509 IKE IKE_PEER_CERTFILE=peer public cert filename for X509 IKE diff --git a/sysconfig/network-scripts/ifup-ipsec b/sysconfig/network-scripts/ifup-ipsec index fc650daf..caef52d0 100755 --- a/sysconfig/network-scripts/ifup-ipsec +++ b/sysconfig/network-scripts/ifup-ipsec @@ -102,6 +102,7 @@ if [ "$KEYING" = "manual" ]; then [ -n "$KEY_ESP_IN" ] && SPD_ESP_IN=yes [ -n "$KEY_ESP_OUT" ] && SPD_ESP_OUT=yes else + [ -z "$IKE_DHGROUP" ] && IKE_DH=2 [ -z "$AH_PROTO" ] && AH_PROTO=sha1 [ -z "$ESP_PROTO" ] && ESP_PROTO=3des @@ -187,7 +188,7 @@ EOF encryption_algorithm $ESP_PROTO; hash_algorithm $AH_PROTO; authentication_method pre_shared_key; - dh_group 2 ; + dh_group $IKE_DHGROUP; } } EOF @@ -209,7 +210,7 @@ EOF encryption_algorithm $ESP_PROTO; hash_algorithm $AH_PROTO; authentication_method rsasig; - dh_group 2; + dh_group $IKE_DHGROUP; } } EOF @@ -221,7 +222,7 @@ EOF encryption_algorithm $ESP_PROTO; hash_algorithm $AH_PROTO; authentication_method gssapi_krb; - dh_group 2 ; + dh_group $IKE_DHGROUP; } } EOF |