TLS-Auth for OpenVPN

Change-Id: I9b3b82f69e97275a52575fdd35774c84137fd0d8
zsol · Jan 7, 2012 · 3d74154 · 3d74154
1 parent 1e96778
commit 3d74154
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
@@ -124,6 +124,14 @@ protected void connect(String serverIp, String username, String password) throws
             args.add("--keysize");
             args.add(p.getKeySize());
         }
+
+        if (p.getUseTlsAuth() && !p.getTlsAuthKey().equals("") && !p.getTlsAuthKeyDirection().equals("")) {
+            args.add("--tls-auth");
+            args.add(p.getTlsAuthKey());
+            if (!p.getTlsAuthKeyDirection().equals("None")) {
+                args.add(p.getTlsAuthKeyDirection());
+            }
+        }
         args.add("--up");
         args.add("/system/xbin/openvpn-up.sh");
         args.add("--script-security");

diff --git a/vpn/java/android/net/vpn/OpenvpnProfile.java b/vpn/java/android/net/vpn/OpenvpnProfile.java
@@ -63,6 +63,12 @@ public class OpenvpnProfile extends VpnProfile {
 
     private String mExtra;
 
+    private boolean mUseTlsAuth;
+
+    private String mTlsAuthKey;
+
+    private String mTlsAuthKeyDirection;
+
     @Override
     public VpnType getType() {
         return VpnType.OPENVPN;
@@ -203,6 +209,30 @@ public String getKeySize() {
         return Integer.toString(mKeySize);
     }
 
+    public void setUseTlsAuth(boolean t) {
+        mUseTlsAuth = t;
+    }
+
+    public boolean getUseTlsAuth() {
+        return mUseTlsAuth;
+    }
+
+    public void setTlsAuthKey(String k) {
+        mTlsAuthKey = k;
+    }
+
+    public String getTlsAuthKey() {
+        return mTlsAuthKey;
+    }
+
+    public void setTlsAuthKeyDirection(String d) {
+        mTlsAuthKeyDirection = d;
+    }
+
+    public String getTlsAuthKeyDirection() {
+        return mTlsAuthKeyDirection;
+    }
+
     public void setExtra(String extra) {
         mExtra = extra;
     }
@@ -228,6 +258,9 @@ protected void readFromParcel(Parcel in) {
         mCipher = in.readString();
         mKeySize = in.readInt();
         mExtra = in.readString();
+        mUseTlsAuth = in.readInt() == 1;
+        mTlsAuthKey = in.readString();
+        mTlsAuthKeyDirection = in.readString();
     }
 
     @Override
@@ -247,5 +280,8 @@ public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeString(mCipher);
         parcel.writeInt(mKeySize);
         parcel.writeString(mExtra);
+        parcel.writeInt(mUseTlsAuth ? 1 : 0);
+        parcel.writeString(mTlsAuthKey);
+        parcel.writeString(mTlsAuthKeyDirection);
     }
 }