From c468f2cd15dfa70397942d0440a8f5ef1ddc71a2 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 12 Feb 2022 15:30:22 -0600 Subject: [PATCH] Update docs --- docs/ikev2-howto-zh.md | 4 ++-- docs/ikev2-howto.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index 375c971..697cb8a 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -126,8 +126,6 @@ To customize IKEv2 or client options, run this script without arguments. ### Windows 7, 8, 10 和 11 -**注：** 如果 IKEv2 辅助脚本的输出中没有包含客户端配置文件的密码，请在提示输入密码时按回车键继续，或者在手动导入 `.p12` 文件时保持密码字段空白。 - Windows 8, 10 和 11 用户可以自动导入 IKEv2 配置： 1. 将生成的 `.p12` 文件安全地传送到你的计算机。 @@ -144,6 +142,8 @@ Windows 8, 10 和 11 用户可以自动导入 IKEv2 配置： certutil -f -importpfx ".p12文件的位置和名称" NoExport ``` + **注：** 如果 IKEv2 辅助脚本的输出中没有包含客户端配置文件的密码，请按回车键继续，或者在手动导入 `.p12` 文件时保持密码字段空白。 + 或者，你也可以手动导入 `.p12` 文件。详细步骤请看 [这里](https://wiki.strongswan.org/projects/strongswan/wiki/Win7Certs)。在导入证书后，你必须确保将客户端证书放在 "个人 -> 证书" 目录中，并且将 CA 证书放在 "受信任的根证书颁发机构 -> 证书" 目录中。 1. 在 Windows 计算机上添加一个新的 IKEv2 VPN 连接。对于 Windows 8, 10 和 11，推荐从命令提示符运行以下命令创建 VPN 连接，以达到更佳的安全性和性能。Windows 7 不支持这些命令，你可以手动创建 VPN 连接（见下面）。 diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index 5516824..6d7394b 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -126,8 +126,6 @@ To customize IKEv2 or client options, run this script without arguments. ### Windows 7, 8, 10 and 11 -**Note:** If there is no password for client config files in the output of the IKEv2 helper script, press Enter to continue when prompted for the password, or if manually importing the `.p12` file, leave the password field blank. - Windows 8, 10 and 11 users can automatically import IKEv2 configuration: 1. Securely transfer the generated `.p12` file to your computer. @@ -144,6 +142,8 @@ Alternatively, you may manually import IKEv2 configuration. These steps apply to certutil -f -importpfx "\path\to\your\file.p12" NoExport ``` + **Note:** If there is no password for client config files in the output of the IKEv2 helper script, press Enter to continue, or if manually importing the `.p12` file, leave the password field blank. + Alternatively, you can manually import the `.p12` file. Click [here](https://wiki.strongswan.org/projects/strongswan/wiki/Win7Certs) for instructions. Make sure that the client cert is placed in "Personal -> Certificates", and the CA cert is placed in "Trusted Root Certification Authorities -> Certificates". 1. On the Windows computer, add a new IKEv2 VPN connection. For Windows 8, 10 and 11, it is recommended to create the VPN connection using the following commands from a command prompt, for improved security and performance. Windows 7 does not support these commands, you may manually create the VPN connection (see below).