gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

证书验证公私钥不匹配

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
duandongmei
2019-04-27 19:00:12 +08:00
parent ad5e517f23
commit 3910bcb4e1
5 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -1515,6 +1515,7 @@ src_ip_pattern=Client IP Pattern
dest_ip_pattern=Server IP Pattern
src_port_pattern=Client Port Pattern
dest_port_pattern=Server Port Pattern
<<<<<<< develop_20190508_branch
url_group_configuration=URL Group Configuration
dns_keyword_group_configuration=DNS Keyword Group Configuration
app_ip_correlation=APP IP Correlation
@@ -1525,3 +1526,5 @@ dns_keyword_group_manage=DNS Keyword Group Manage
old_asn_group_manage=ASN Group
url_group_manage=URL Group Manage
range_cross=Found intersections between Server IP address and Client IP address
app_ip_correlation=APP IP Correlation
public_private_file_error=Public-private key mismatch