[Astlinux-commits] SF.net SVN: astlinux:[5960] branches/1.0

[<abe...@us...>]

Revision: 5960
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5960&view=rev
Author:   abelbeck
Date:     2013-02-18 19:57:20 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
openvpn, server and client, add optional Auth HMAC variables, OVPN_AUTH and OVPNC_AUTH

Modified Paths:
--------------
    branches/1.0/package/openvpn/openvpn.init
    branches/1.0/package/openvpn/openvpnclient.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init	2013-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/package/openvpn/openvpn.init	2013-02-18 19:57:20 UTC (rev 5960)
@@ -103,6 +103,9 @@
     if [ -n "$OVPN_CIPHER" ]; then
       echo "cipher $OVPN_CIPHER" >> /tmp/etc/openvpn.conf
     fi
+    if [ -n "$OVPN_AUTH" ]; then
+      echo "auth $OVPN_AUTH" >> /tmp/etc/openvpn.conf
+    fi
     if [ -n "$OVPN_TOPOLOGY" ]; then
       echo "topology $OVPN_TOPOLOGY" >> /tmp/etc/openvpn.conf
     fi

Modified: branches/1.0/package/openvpn/openvpnclient.init
===================================================================
--- branches/1.0/package/openvpn/openvpnclient.init	2013-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/package/openvpn/openvpnclient.init	2013-02-18 19:57:20 UTC (rev 5960)
@@ -70,6 +70,9 @@
     if [ -n "$OVPNC_CIPHER" ]; then
       echo "cipher $OVPNC_CIPHER" >> /tmp/etc/openvpnclient.conf
     fi
+    if [ -n "$OVPNC_AUTH" ]; then
+      echo "auth $OVPNC_AUTH" >> /tmp/etc/openvpnclient.conf
+    fi
     if [ -n "$OVPNC_NSCERTTYPE" ]; then
       echo "ns-cert-type $OVPNC_NSCERTTYPE" >> /tmp/etc/openvpnclient.conf
     fi

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-02-18 19:57:20 UTC (rev 5960)
@@ -519,9 +519,10 @@
 ## Enable QoS for the tunnel packet. yes|no
 ## Set the TOS field of the tunnel packet to what the payload's TOS is.
 #OVPN_QOS="yes"
-## Define the Cipher, defaults to BF-CBC if not defined
-## Change to match any hardware crypto acceleration, the client's setting must match
+## Define the Cipher, defaults to BF-CBC if not defined, the client's setting must match
 #OVPN_CIPHER="AES-128-CBC"
+## Define the Auth HMAC, defaults to SHA1 if not defined, the client's setting must match
+#OVPN_AUTH="SHA256"
 ## Restrict OpenVPN clients allowed to connect, by CommonName.
 ## Client CommonName list lines are newline terminated.
 ## If not defined, the default, any client with a valid cert/key is allowed to connect.
@@ -567,9 +568,10 @@
 ## Enable QoS for the tunnel packet. yes|no
 ## Set the TOS field of the tunnel packet to what the payload's TOS is.
 #OVPNC_QOS="yes"
-## Define the Cipher, defaults to BF-CBC if not defined
-## Change to match any hardware crypto acceleration, the client's setting must match
+## Define the Cipher, defaults to BF-CBC if not defined, the server's setting must match
 #OVPNC_CIPHER="AES-128-CBC"
+## Define the Auth HMAC, defaults to SHA1 if not defined, the server's setting must match
+#OVPNC_AUTH="SHA256"
 ## Define ns-cert-type if set
 #OVPNC_NSCERTTYPE="server"
 ## Allow OpenVPN Client tunnel to one LAN Interface, defaults to disallow

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.