Skip to content

Commit

Permalink
[bugfix] 更新证书 (#114)
Browse files Browse the repository at this point in the history
* fix: 更新证书,兼容ios13 & macos10.15新的证书策略

* fix: 更新证书为rootCA证书
  • Loading branch information
kainstar authored Sep 25, 2019
1 parent 9c93384 commit 101cd98
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 48 deletions.
38 changes: 18 additions & 20 deletions resource/certificate/zproxy.crt.pem
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDjjCCAnYCCQDh91aaBTlFxTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMC
Q04xETAPBgNVBAgMCFpoZWppYW5nMQswCQYDVQQHDAJIWjEPMA0GA1UECgwGeW91
emFuMRIwEAYDVQQLDAl5b3V6YW4tZmUxEjAQBgNVBAMMCXphbi1wcm94eTEgMB4G
CSqGSIb3DQEJARYRbml1bmFpQHlvdXphbi5jb20wHhcNMTkwNzEwMDI0NTI2WhcN
MjExMDEyMDI0NTI2WjCBiDELMAkGA1UEBhMCQ04xETAPBgNVBAgMCFpoZWppYW5n
MQswCQYDVQQHDAJIWjEPMA0GA1UECgwGeW91emFuMRIwEAYDVQQLDAl5b3V6YW4t
ZmUxEjAQBgNVBAMMCXphbi1wcm94eTEgMB4GCSqGSIb3DQEJARYRbml1bmFpQHlv
dXphbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDINGorYgCZ
GTQ5zxmPYeqiMe8Z0QUknq2Gq8y3rxG1O37MY+XYbKjWtfEPyrD2vD99fr0cbGQM
znTTw1DF/LLuDWxUJCH5u4V9gUFVGFxhhrba54ewOELDvFAadUqWdUAnnlZ07qeT
cfvlrAoFTG1w4oMpXq0vYDmH7a/jEIMPV4XWlTK4heEw6ob59JQYkCVOa3Jrh0VW
IJYHlhoe7K+2hABKshpnB1nd/WyvZ7g5fKCRwcDqgTAlQ2z2QeA0UY9OwLFoHvsT
9nAz6IZkVue7fsUzJzVtCApf51eUd6rXEhNyVTmfR9cnKGf6w3T5TVpyBZx7gAw1
8RKDf2//rNvJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKtYLI9d5iK35hbFrGRL
/EOPvaOQOlU4VaqqN4qUpnywgosnv5J41S8s3TCkVHxebxL7bamCbyDQalenGB04
0v9vqGn1kFVQvh1YFiPrvHNgLTo3mHYxzg0LI0qgGPn4vM/ddwPrxtqFzfFb8pAQ
sX1Fndr8IqS1lne8YWigi52n4hcv4zPE7AUMKiHhl8EQYbwK+Yl3dgcq/DYQEoBm
B467LtSr3VlXO9ocMC0j2TdzaJatj8csO+4AyV0C0cYk0nslKaYOkQfGHzz4+9RW
fD2nHBjR8TPAra3pRUGj/pD+Y6qKWY/ntpocHyL1VNIa19TJKwggzmCHWgzlR7ej
09o=
MIIDMzCCAhugAwIBAgIDAhYIMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNVBAYTAkNO
MQ8wDQYDVQQKEwZ5b3V6YW4xCzAJBgNVBAgTAkhaMRIwEAYDVQQLEwl5b3V6YW4t
ZmUxEjAQBgNVBAMTCXphbi1wcm94eTAeFw0xOTA5MjUwMzIzMTNaFw0yMTA5MjUw
MzIzMTNaMFMxCzAJBgNVBAYTAkNOMQ8wDQYDVQQKEwZ5b3V6YW4xCzAJBgNVBAgT
AkhaMRIwEAYDVQQLEwl5b3V6YW4tZmUxEjAQBgNVBAMTCXphbi1wcm94eTCCASIw
DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiVbcCPva3cWTxcwam7kjL0Yb3J
pcyvnKpWJAmAvslCQRATThNwLNm/beEOLOv560j/lDmJzEqqv9XUlfQAFrS4nj+5
j2ccEK73ee8d5JNuBokX9FBR9PIrl0w0d96bu5F5Evhf7y1NPw9NqBP660eojKMT
AhBIY2zky9gL8UzNknisg1uYTiQnwxKq3hPmgOVtB/O/WUS5vNnecZ8qu6Tp91GQ
33EaU7kmLfRHUdU9NG58LnsrPuk/5wL9LMSVp0FROhu7MGj4+93Ooslxxff8e97v
sZp2necfIb/tWUpNiRelSCu8FIwY7gjjksse14R3B8DaDcx8+3qVIXKpQiECAwEA
AaMQMA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMqsC5qqwld41
6Jkvs0aGN+RzYQwBnSRfpGOAuNIWedzR9uwqT0O4bEmGYFs+00VXFsbua7Q69Zcd
bW5W5Sgk/zrMAGY2QJB7lXk7SYbJ/v/roQjgHYUcAGHdrptD3dbWKrfSY+SMBSUC
1Q9Gjtamtdhy/tUOkzr3GBvrsoHdZ82aSoJWqKvJw6ZWTrqgScPV6oIA/0PgX7dV
4LzqOpWDYvQR1ceDv2ZgWcTcPHlsenD5WjTDkZlTLzKuu3W/UZmEdpgbTSZrkPan
QlsvO+AUveRUR0sfpRIycUeXB7ZKAMWA5NGGopiSpjA/mCyyzt4EQN3DL1IN2IMi
HK3JrBzXPw==
-----END CERTIFICATE-----
55 changes: 27 additions & 28 deletions resource/certificate/zproxy.key.pem
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDINGorYgCZGTQ5
zxmPYeqiMe8Z0QUknq2Gq8y3rxG1O37MY+XYbKjWtfEPyrD2vD99fr0cbGQMznTT
w1DF/LLuDWxUJCH5u4V9gUFVGFxhhrba54ewOELDvFAadUqWdUAnnlZ07qeTcfvl
rAoFTG1w4oMpXq0vYDmH7a/jEIMPV4XWlTK4heEw6ob59JQYkCVOa3Jrh0VWIJYH
lhoe7K+2hABKshpnB1nd/WyvZ7g5fKCRwcDqgTAlQ2z2QeA0UY9OwLFoHvsT9nAz
6IZkVue7fsUzJzVtCApf51eUd6rXEhNyVTmfR9cnKGf6w3T5TVpyBZx7gAw18RKD
f2//rNvJAgMBAAECggEBAIQDxAqNWhWaQAzqmlEo4P5I7QBaCwkltQj7mkd5IrUd
4TPHn9VBeWfzm1ytbFmWskr/WpY2hxbGwNSuk0GqqxY8NbWaCelSFOk4ZStGoAwT
N9pLF/dEcgn9z9hShXeHI2G8kAgVIt0gKVk+Q3FQ/02Tn6eU7aAy1Fzkh7mztqhT
A4aMcVr80jwi8G1v6D7fpmUjc6NVrPRliPVhj0jjfDn00GO6r4BboDoXY8ByM9Sm
QB7Tur0tCdN2JYhBEiBRxGx7ow9grl6STVa11KBeWozWL3cw1GBCIqv8Ti0K5hIo
c0IV4sQgej6MZmcTJznzxPTQFJ6SLxABvOUr1pzjyPECgYEA93pUIY/cYhI18B1k
kzQIzii3fwyOEv4v1kPA4D15C4b5Y6toihOiRjRv7KP4xSEfenBdSszM+66HknMZ
Kcz2hkOzrWtAoSSpbOVw1R4Tnuf9Yq7g5JNfmT497soIxo9C8CzWht64wEXzzMj2
mlWyMAaGQcWYN66sQZg1hd0miO0CgYEAzxlYIRRjuta2LG5dXj4IdJodIVpzn6Bq
gxlgXi926qQ/UsQgoON+AEBgcC/7434Zk6UBAJA2sKMRdZ1YSnBcSu7RPA6eNYr+
cHKjP6pSsWSo14jaIXn9iekKowg8iEC7okmzM888ogHuWXRdCgwUWdA3Am3g4LNo
o2gTnJxdTs0CgYA9VwDLYNELLeBYp7BqHBeiocz5nK8KXh6VSS3hZts91DK0VaQP
tVYfeJfVW78pfVBEFN3K0IBuUZAg6I5wIfFozhcXAOKADopAB460BERwuqe/cgEk
JrMnVJodOc57CL9asIJr44B/h9cqBxW4o00LQlK8srFL++uORp/dkjce8QKBgGSl
oojhCd7BfmN1d3bXmvBf/Yw6EzsekOUJriXX12kNTaEBpAHMzW192+Bp0Xarz+5L
IIOPkqShe1i3kTMMDC52hcU0LXtEA4fOjrvgILQJgWzOG4RtbuRZF0xIMnLdUtL6
Elc5ffQWECn1PUomuLU1Vaaek81gI5hWekGAVHB5AoGAGCkGrRdrlfk5YJihZWs8
DJZnCSR7IbWJYPyj0f66rXmMDFQgzbEfLRoPKL6tsmZ7THKtsVwjqOHNzu3shFav
aOYy9VtGK+CnFbk8mLdBJAAZwJ8dnS+FYiX7d57KrHSgSa+mKa9rkTxZTbXcGF2D
Lc0cqgysdearSh0Zy7d1pEw=
-----END PRIVATE KEY-----
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAuJVtwI+9rdxZPFzBqbuSMvRhvcmlzK+cqlYkCYC+yUJBEBNO
E3As2b9t4Q4s6/nrSP+UOYnMSqq/1dSV9AAWtLieP7mPZxwQrvd57x3kk24GiRf0
UFH08iuXTDR33pu7kXkS+F/vLU0/D02oE/rrR6iMoxMCEEhjbOTL2AvxTM2SeKyD
W5hOJCfDEqreE+aA5W0H879ZRLm82d5xnyq7pOn3UZDfcRpTuSYt9EdR1T00bnwu
eys+6T/nAv0sxJWnQVE6G7swaPj73c6iyXHF9/x73u+xmnad5x8hv+1ZSk2JF6VI
K7wUjBjuCOOSyx7XhHcHwNoNzHz7epUhcqlCIQIDAQABAoIBACp1XOiVZ9ktPW2Q
HJARcGC+LBl+39+EabIY3HM/JSOgVN0Aw83e2MJBsWG6ZATn2QJSn+LYWqC2RChI
nTGiL5bkfKpF4cGjCAdnL6ocIy7yeRhh5TXwlDp8YnIKA6S2B+A/jGiLkLXH9gBs
KYRnDGXQVIFSZwAd1pj+zBDnNlsm7k45FU9X6t7b/NuhwAChMbXkTIKe8Nx1t6fi
OZujbttUAkVAxYFnNjCOJuACstyBNBbRSUkKS15Oaxkb2d3kcLkO5aHBzwRk1d6J
orZczpgGCSJWfyOMnSiTr7iuw6yfpDsjjIVlQp1AeqgIVCrhwf9G0ueXEVxDzfLO
fwvix70CgYEA29vWxRJvLzxEd34fQL4Bjq3XUvvc3jl7502UYafAqGErBoZi/XaZ
oVoVXpkEby/o6YEK2THotumF/Oe3pukvulno5miwwBfOe88lxioTZi16NecB1gD0
jdlOnd6C38TAm1x13k5jB0s4g40aue4Goj8EFXm7NZbfYaxVhncsuMsCgYEA1u0i
k6Mo+zJsV8M8IRLUfCzrivlJWRLW7Dm1g7vBugeQllPQUT1zGe4Y4tCYcQ0nlixe
5/xssKSfaoN9TvE/mqce/O2wM5Y7u3P/iE7iHpEmmmU64QQbU/pOG2+7VfSODUl6
pgPVDWofrK/MyJMW3luqCDprKVNdZ/iGhhJDD0MCgYAxBO75uYZ4raNGUSR+tt56
BWCA7A7urTpm8/ElZNWbtS52offoM01FoGQrV0qZz8DKby8QBgSw45gwLynPWSZ/
EhTPaoAeFDDBggoWCMOSgIlDA2JxaH0eM1lH8ZiUc7XN7euJyUhjE+5hxlAzLFLm
Uc6DS0TmSeE8UcQv2tppyQKBgCsMrptR2BiQngDqOzYItoT03m0kx5tO2bvRR1lO
l1wyvbROr3BGVbLA7T0pOQ+T6fT7iDsBZafwIXpNQiE401uf0+Ynmd6LXgWLE4jy
+/nRayEL28JMd0jX3yNBuw1ZgcaJjEaKh/c65YNKZ0NZqv/47lLdmK9bYl87+X4L
VGFPAoGBALWhQZ9CmYPV3bQ30P4B8iw+T/+RedfzVbVKmyx1a21TjN11z14qLtC2
AY2Zs7guCBSCRnRpc3K1nSYXk/M+gptv0h73L97qo5xvQh4oG5yUN/m6i4iUgr0g
jNLKAk64kqtd1DwTsHCdEhiFPPRSkGH7fx2ZMDen+VNiwQpoA8Jy
-----END RSA PRIVATE KEY-----

0 comments on commit 101cd98

Please sign in to comment.