mirror of
https://github.com/hwdsl2/setup-ipsec-vpn.git
synced 2024-06-20 20:56:03 +02:00
Update docs
- Add notes for the faster IPsec/XAuth and IKEv2 modes - Cleanup
This commit is contained in:
hwdsl2
parent
e22664f7a2
commit
20f57975b3
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
*其他语言版本: [English](clients-xauth.md), [简体中文](clients-xauth-zh.md).*
|
||||
|
||||
*注: 你也可以使用 [IPsec/L2TP 模式](clients-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。*
|
||||
*注： 你也可以使用 [IPsec/L2TP 模式](clients-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。*
|
||||
|
||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md" target="_blank">搭建自己的 VPN 服务器</a>之后，你可以按照下面的步骤来配置你的设备。IPsec/XAuth ("Cisco IPsec") 在 Android, iOS 和 OS X 上均受支持，无需安装额外的软件。Windows 用户可以使用免费的 <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft 客户端</a>。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。
|
||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md" target="_blank">搭建自己的 VPN 服务器</a>之后，按照下面的步骤来配置你的设备。IPsec/XAuth ("Cisco IPsec") 在 Android, iOS 和 OS X 上均受支持，无需安装额外的软件。Windows 用户可以使用免费的 <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft 客户端</a>。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。
|
||||
|
||||
IPsec/XAuth 模式也称为 "Cisco IPsec"。该模式通常能够比 IPsec/L2TP 更高效地传输数据。
|
||||
IPsec/XAuth 模式也称为 "Cisco IPsec"。该模式通常能够比 IPsec/L2TP **更高效**地传输数据（较低的额外开销）。
|
||||
|
||||
---
|
||||
* 平台名称
|
||||
|
|
@ -17,7 +17,7 @@ IPsec/XAuth 模式也称为 "Cisco IPsec"。该模式通常能够比 IPsec/L2TP
|
|||
|
||||
## Windows
|
||||
|
||||
**注:** 你也可以使用 [IPsec/L2TP 模式](clients-zh.md) 连接，无需安装额外的软件。
|
||||
**注：** 你也可以使用 [IPsec/L2TP 模式](clients-zh.md) 连接，无需安装额外的软件。
|
||||
|
||||
1. 下载并安装免费的 <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft VPN 客户端</a>。
|
||||
**注：** 该 VPN 客户端支持 Windows 2K/XP/Vista/7/8 系统。
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, follow these steps to configure your devices. IPsec/XAuth ("Cisco IPsec") is natively supported by Android, iOS and OS X. There is no additional software to install. Windows users can use the free <a href="https://www.shrew.net/download/vpn" target="_blank">Shrew Soft client</a>. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly.
|
||||
|
||||
IPsec/XAuth mode is also called "Cisco IPsec". This mode is generally faster than IPsec/L2TP with less overhead.
|
||||
IPsec/XAuth mode is also called "Cisco IPsec". This mode is generally **faster than** IPsec/L2TP with less overhead.
|
||||
|
||||
---
|
||||
* Platforms
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
*其他语言版本: [English](clients.md), [简体中文](clients-zh.md).*
|
||||
|
||||
*注: 你也可以使用 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。*
|
||||
*注： 你也可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。*
|
||||
|
||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md" target="_blank">搭建自己的 VPN 服务器</a>之后，你可以按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持，无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。
|
||||
在成功<a href="https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md" target="_blank">搭建自己的 VPN 服务器</a>之后，按照下面的步骤来配置你的设备。IPsec/L2TP 在 Android, iOS, OS X 和 Windows 上均受支持，无需安装额外的软件。设置过程通常只需要几分钟。如果无法连接,请首先检查是否输入了正确的 VPN 登录凭证。
|
||||
|
||||
---
|
||||
* 平台名称
|
||||
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
## Windows
|
||||
|
||||
**注：** 你也可以配置并且使用更新的 [IKEv2 模式](ikev2-howto-zh.md) 连接。
|
||||
|
||||
### Windows 10 and 8.x
|
||||
|
||||
1. 右键单击系统托盘中的无线/网络图标。
|
||||
|
|
@ -81,6 +83,8 @@
|
|||
|
||||
## OS X
|
||||
|
||||
**注：** 你也可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接。
|
||||
|
||||
1. 打开系统偏好设置并转到网络部分。
|
||||
1. 在窗口左下角单击 **+** 按钮。
|
||||
1. 从 **接口** 下拉菜单选择 **VPN**。
|
||||
|
|
@ -102,6 +106,8 @@
|
|||
|
||||
## Android
|
||||
|
||||
**注：** 你也可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接，或者配置 [IKEv2](ikev2-howto-zh.md)。
|
||||
|
||||
1. 启动 **设置** 应用程序。
|
||||
1. 在 **无线和网络** 部分单击 **更多...**。
|
||||
1. 单击 **VPN**。
|
||||
|
|
@ -123,6 +129,8 @@ VPN 连接成功后，会在通知栏显示图标。最后你可以到 <a href="
|
|||
|
||||
## iOS
|
||||
|
||||
**注：** 你也可以使用更高效的 [IPsec/XAuth 模式](clients-xauth-zh.md) 连接。
|
||||
|
||||
1. 进入设置 -> 通用 -> VPN。
|
||||
1. 单击 **添加VPN配置...**。
|
||||
1. 单击 **类型** 。选择 **L2TP** 并返回。
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
*Read this in other languages: [English](clients.md), [简体中文](clients-zh.md).*
|
||||
|
||||
*Note: You may also connect using [IPsec/XAuth mode](clients-xauth.md), or set up [IKEv2](ikev2-howto.md).*
|
||||
*Note: You may also connect using the faster [IPsec/XAuth mode](clients-xauth.md), or set up [IKEv2](ikev2-howto.md).*
|
||||
|
||||
After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">setting up your own VPN server</a>, follow these steps to configure your devices. IPsec/L2TP is natively supported by Android, iOS, OS X, and Windows. There is no additional software to install. Setup should only take a few minutes. In case you are unable to connect, first check to make sure the VPN credentials were entered correctly.
|
||||
|
||||
|
|
@ -27,6 +27,8 @@ After <a href="https://github.com/hwdsl2/setup-ipsec-vpn" target="_blank">settin
|
|||
|
||||
## Windows
|
||||
|
||||
**Note:** You may also set up and connect using the newer [IKEv2 mode](ikev2-howto.md).
|
||||
|
||||
### Windows 10 and 8.x
|
||||
|
||||
1. Right-click on the wireless/network icon in your system tray.
|
||||
|
|
@ -81,6 +83,8 @@ If you get an error when trying to connect, see <a href="#troubleshooting">Troub
|
|||
|
||||
## OS X
|
||||
|
||||
**Note:** You may also connect using the faster [IPsec/XAuth mode](clients-xauth.md).
|
||||
|
||||
1. Open System Preferences and go to the Network section.
|
||||
1. Click the **+** button in the lower-left corner of the window.
|
||||
1. Select **VPN** from the **Interface** drop-down menu.
|
||||
|
|
@ -102,6 +106,8 @@ To connect to the VPN: Use the menu bar icon, or go to the Network section of Sy
|
|||
|
||||
## Android
|
||||
|
||||
**Note:** You may also connect using the faster [IPsec/XAuth mode](clients-xauth.md), or set up [IKEv2](ikev2-howto.md).
|
||||
|
||||
1. Launch the **Settings** application.
|
||||
1. Tap **More...** in the **Wireless & Networks** section.
|
||||
1. Tap **VPN**.
|
||||
|
|
@ -123,6 +129,8 @@ If you get an error when trying to connect, see <a href="#troubleshooting">Troub
|
|||
|
||||
## iOS
|
||||
|
||||
**Note:** You may also connect using the faster [IPsec/XAuth mode](clients-xauth.md).
|
||||
|
||||
1. Go to Settings -> General -> VPN.
|
||||
1. Tap **Add VPN Configuration...**.
|
||||
1. Tap **Type**. Select **L2TP** and go back.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Windows 7 和更新版本支持 IKEv2 协议标准，通过 Microsoft 的 Agile
|
|||
Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来对 IKEv2 客户端进行身份验证。该方法无需 IPsec PSK, 用户名或密码。它可以用于以下系统：
|
||||
|
||||
- Windows 7, 8.x 和 10
|
||||
- strongSwan Android VPN 客户端
|
||||
- Android 4.x 和更新版本（使用 strongSwan VPN 客户端）
|
||||
|
||||
下面举例说明如何在 Libreswan 上配置 IKEv2。以下命令必须用 `root` 账户运行。
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来
|
|||
|
||||
**注：** 另外，在这里你也可以指定 VPN 服务器的域名。例如： `PUBLIC_IP=myvpn.example.com`。
|
||||
|
||||
1. 在 `/etc/ipsec.conf` 文件中添加一个新的 IKEv2 连接:
|
||||
1. 在 `/etc/ipsec.conf` 文件中添加一个新的 IKEv2 连接：
|
||||
|
||||
```bash
|
||||
$ cat >> /etc/ipsec.conf <<EOF
|
||||
|
|
@ -189,11 +189,11 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来
|
|||
1. 启用新的 VPN 连接，并且开始使用 IKEv2 VPN！
|
||||
https://wiki.strongswan.org/projects/strongswan/wiki/Win7Connect
|
||||
|
||||
1. （可选步骤） 如需启用更安全的加密方式，你可以添加 <a href="https://wiki.strongswan.org/projects/strongswan/wiki/WindowsClients#AES-256-CBC-and-MODP2048" target="_blank">这个注册表键</a> 并重启。
|
||||
1. （可选步骤） 如需启用更强的加密算法，你可以添加注册表键 `NegotiateDH2048_AES256` 并重启。更多信息请看<a href="https://wiki.strongswan.org/projects/strongswan/wiki/WindowsClients#AES-256-CBC-and-MODP2048" target="_blank">这里</a>。
|
||||
|
||||
#### Android 4.x 和更新版本
|
||||
|
||||
1. 从 **Google Play** 安装 <a href="https://play.google.com/store/apps/details?id=org.strongswan.android" target="_blank">strongSwan VPN Client</a>。
|
||||
1. 从 **Google Play** 安装 <a href="https://play.google.com/store/apps/details?id=org.strongswan.android" target="_blank">strongSwan VPN 客户端</a>。
|
||||
1. 打开 VPN 客户端，然后单击 **Add VPN Profile**。
|
||||
1. 在 **Server** 字段中输入 `你的 VPN 服务器 IP`。
|
||||
1. 在 **VPN Type** 下拉菜单选择 **IKEv2 Certificate**。
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Windows 7 and newer releases support the IKEv2 standard through Microsoft's Agil
|
|||
Libreswan can authenticate IKEv2 clients on the basis of X.509 Machine Certificates using RSA signatures. This method does not require an IPsec PSK, username or password. It can be used with:
|
||||
|
||||
- Windows 7, 8.x and 10
|
||||
- strongSwan Android VPN client
|
||||
- Android 4.x and newer (using the strongSwan VPN client)
|
||||
|
||||
The following example shows how to configure IKEv2 with Libreswan. Commands below must be run as `root`.
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ Before continuing, make sure you have successfully <a href="https://github.com/h
|
|||
1. Start the new VPN connection, and enjoy your IKEv2 VPN!
|
||||
https://wiki.strongswan.org/projects/strongswan/wiki/Win7Connect
|
||||
|
||||
1. (Optional) You may enable stronger ciphers by adding <a href="https://wiki.strongswan.org/projects/strongswan/wiki/WindowsClients#AES-256-CBC-and-MODP2048" target="_blank">this registry key</a> and reboot.
|
||||
1. (Optional) You may enable stronger ciphers by adding the registry key `NegotiateDH2048_AES256` and reboot. Read more <a href="https://wiki.strongswan.org/projects/strongswan/wiki/WindowsClients#AES-256-CBC-and-MODP2048" target="_blank">here</a>.
|
||||
|
||||
#### Android 4.x and newer
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user