This commit is contained in:
nielsandriesse 2021-04-07 11:34:28 +10:00
parent 75f5591fe0
commit f7a75a1b80
7 changed files with 75 additions and 68 deletions

View File

@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
MIIEFzCCAv+gAwIBAgIUHsrOj+bkbwe+j/etfYUm8nuDv/0wDQYJKoZIhvcNAQEL
BQAwgZoxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJ
TWVsYm91cm5lMSUwIwYDVQQKDBxPeGVuIFByaXZhY3kgVGVjaCBGb3VuZGF0aW9u
MR8wHQYDVQQDDBZwdWJsaWMubG9raS5mb3VuZGF0aW9uMRwwGgYJKoZIhvcNAQkB
Fg1qYXNvbkBveGVuLmlvMB4XDTIxMDQwMTAwMzk1N1oXDTIzMDQwMTAwMzk1N1ow
gZoxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVs
Ym91cm5lMSUwIwYDVQQKDBxPeGVuIFByaXZhY3kgVGVjaCBGb3VuZGF0aW9uMR8w
HQYDVQQDDBZwdWJsaWMubG9raS5mb3VuZGF0aW9uMRwwGgYJKoZIhvcNAQkBFg1q
YXNvbkBveGVuLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA19gW
hE/zAboA7GKLsWeClfR5OQeQ5AyZLw1OsFlz+niVpo8yjImdkiPkHVs1jhXVcwJy
iCUjAVw9r7Jlzdjoly32X1c92KW5yUrTtDjyySZX5rXUkrczKzQEE8RP6Wz+Re7/
fXvqUD84wudpEhxk4Pgbhy0iEmGyMsWH4aipH3Jg2pgWfdVxCRrQY1NRGHhcg0bi
ziy19Rm4+RfesLRNtSd9/v8NMGj3EkyMzqOorkZwb/dZYBA421BtAPEnvPYrcZ7E
Jv8teLYC4hc3GFf4MnZKK5N4BGN33d/7U62CiiK3xWjNJiF3qUJIzT1i5kYbAH6l
yy9qiAxLm3bIK7zfdwIDAQABo1MwUTAdBgNVHQ4EFgQUr76UyP7smu1jeBeH4luz
4UXaFUkwHwYDVR0jBBgwFoAUr76UyP7smu1jeBeH4luz4UXaFUkwDwYDVR0TAQH/
BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEACy8vA/fGPc1vb+ZcT/aHC/tJOUa2
7mfOR3ANvAL4Klo7Gj2I/Dofk7EODPnk1DEHEJBLU+xh5ShbRdRqrQP+3u094xkA
D9fee4gM+X2fNms/vO2u1EtoLCkkTQZYzI+O73MO5D4SAtQ3zo/lfHyk/L8dZ6tc
NLCVcF+lf82nOvBl4hD3+WGuHDpjOnBiOCv1W7tdN8dT0tsGrzXKrIAayvr9YKoJ
HTFDryDUX9nAqrnGPsJ8bB1qul/TgeliSqGgoN90t9RkQ3/7aaqaAS8IkQBie57X
sgVl0RL9+uaty/Wr2WBE1v/4qXUSbaQK2zWOA9rvrtScbjVB1J9PABYheA==
MIIEEzCCAvugAwIBAgIUY9RQqbjhsQEkdeSgV9L0os9xZ7AwDQYJKoZIhvcNAQEL
BQAwfDELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlN
ZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNoIEZvdW5kYXRpb24x
HzAdBgNVBAMMFnB1YmxpYy5sb2tpLmZvdW5kYXRpb24wHhcNMjEwNDA3MDExMDMx
WhcNMjMwNDA3MDExMDMxWjB8MQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9y
aWExEjAQBgNVBAcMCU1lbGJvdXJuZTElMCMGA1UECgwcT3hlbiBQcml2YWN5IFRl
Y2ggRm91bmRhdGlvbjEfMB0GA1UEAwwWcHVibGljLmxva2kuZm91bmRhdGlvbjCC
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5dBJSIR5+VNNUxUOo6FG0e
RmZteRqBt50KXGbOi2A23a6sa57pLFh9Yw3hmlWV+QCL7ipG1X4IC55OStgoesf+
K65VwEMP6Mtq0sSJS3R5TiuV2ZSRdSZTVjUyRXVe5T4Aw6wXVTAbc/HsyS780tDh
GclfDHhonPhZpmTAnSbfMOS+BfOnBNvDxdto0kVh6k5nrGlkT4ECloulHTQF2lwJ
0D6IOtv9AJplPdg6s2c4dY7durOdvr3NNVfvn5PTeRvbEPqzZur4WUUKIPNGu6mY
PxImqd4eUsL0Vod4aAsTIx4YMmCTi0m9W6zJI6nXcK/6a+iiA3+NTNMzEA9gQhEC
AwEAAaOBjDCBiTAdBgNVHQ4EFgQU/zahokxLvvFUpbnM6z/pwS1KsvwwHwYDVR0j
BBgwFoAU/zahokxLvvFUpbnM6z/pwS1KsvwwDwYDVR0TAQH/BAUwAwEB/zAhBgNV
HREEGjAYghZwdWJsaWMubG9raS5mb3VuZGF0aW9uMBMGA1UdJQQMMAoGCCsGAQUF
BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBql+JvoqpaYrFFTOuDn08U+pdcd3GM7tbI
zRH5LU+YnIpp9aRheek+2COW8DXsIy/kUngETCMLmX6ZaUj/WdHnTDkB0KTgxSHv
ad3ZznKPKZ26qJOklr+0ZWj4J3jHbisSzql6mqq7R2Kp4ESwzwqxvkbykM5RUnmz
Go/3Ol7bpN/ZVwwEkGfD/5rRHf57E/gZn2pBO+zotlQgr7HKRsIXQ2hIXVQqWmPQ
lvfIwrwAZlfES7BARFnHOpyVQxV8uNcV5K5eXzuVFjHBqvq+BtyGhWkP9yKJCHS9
OUXxch0rzRsH2C/kRVVhEk0pI3qlFiRC8pCJs98SNE9l69EQtG7I
-----END CERTIFICATE-----

View File

@ -1,24 +1,25 @@
-----BEGIN CERTIFICATE-----
MIID8TCCAtmgAwIBAgIUFABTr4FKSbmNjvA7/6tAph9hTiAwDQYJKoZIhvcNAQEL
BQAwgYcxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJ
TWVsYm91cm5lMRAwDgYDVQQKDAdTZXNzaW9uMSMwIQYDVQQDDBpzdG9yYWdlLnNl
ZWQxLmxva2kubmV0d29yazEaMBgGCSqGSIb3DQEJARYLa2VlQG94ZW4uaW8wHhcN
MjEwNDAxMDI0ODA2WhcNMjMwMzE0MDI0ODA2WjCBhzELMAkGA1UEBhMCQVUxETAP
BgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlNZWxib3VybmUxEDAOBgNVBAoMB1Nl
c3Npb24xIzAhBgNVBAMMGnN0b3JhZ2Uuc2VlZDEubG9raS5uZXR3b3JrMRowGAYJ
KoZIhvcNAQkBFgtrZWVAb3hlbi5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAOlD7TsPY3ytGYEVFILXr0o/GgHXgyq8iHxthpICFA1wjX6hYIixD/ma
Kaivm5onJ6YPyvMwE1VhmN6gmZRVe3qCf/bOVKLdv/l9VAaONpQhL1CEswKYcLWT
x4npKC+WnjsGggjoZB9yx8AENhFGXmDk75lS/xUMRyFG/Z9C0hODddbQUTRw57vQ
7d5yPd48Nol9lwC0WrN1j1xMlsXgjsudgO8IYjHG3lHymMnbtBFf5uICUw738REB
mjSFBABPK5nTKIPgvIf+9tfORO+nyatJY6D5cYQ/fuzzPOe1diXtOHIkspfUxwr2
IwKy4p+FcSeacrS8tKt5RaXLELvbHR0CAwEAAaNTMFEwHQYDVR0OBBYEFCiEhN1W
Ge7C+8EF+Xl1O0BTJ4r8MB8GA1UdIwQYMBaAFCiEhN1WGe7C+8EF+Xl1O0BTJ4r8
MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAG1QKBaad+bfz0yF
n5pRM5UJ6BsedSAo6KohBKphN64VovGWFwUEhIpgwesBo4NK6UmergOtMFUJ7kCH
AbI4/G+Wamqh1dz7CwitS6j9RLKvMqA4x9abs97xxIh17FD5VGysgwOz9JatmkFn
eeBhO6O1xF2z1VKUUe0jn/HRgoYK9Lvv7J+LgwQRmERl4/vrpVHcQObC1h2DuwPx
C9qrQY2yyrYLYfkh+f6Mh5K8i6ln8wbo1WdEMK93uf7EqHKX74lLQslokqy/Biov
CjDxRPUcGp2Jbs33t44C3S/PJ7hlNTy6qK0polwquxiEIDuD5QPx5wIYSZVRUvJD
Oy17c4Q=
MIIEITCCAwmgAwIBAgIUJsox1ZQPK/6iDsCC+MUJfNAlFuYwDQYJKoZIhvcNAQEL
BQAwgYAxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJ
TWVsYm91cm5lMSUwIwYDVQQKDBxPeGVuIFByaXZhY3kgVGVjaCBGb3VuZGF0aW9u
MSMwIQYDVQQDDBpzdG9yYWdlLnNlZWQxLmxva2kubmV0d29yazAeFw0yMTA0MDcw
MTE5MjZaFw0yMzA0MDcwMTE5MjZaMIGAMQswCQYDVQQGEwJBVTERMA8GA1UECAwI
VmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTElMCMGA1UECgwcT3hlbiBQcml2
YWN5IFRlY2ggRm91bmRhdGlvbjEjMCEGA1UEAwwac3RvcmFnZS5zZWVkMS5sb2tp
Lm5ldHdvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtWH3Rz8Dd
kEmM7tcBWHrJ/G8drr/+qidboEVYzxpyRjszaDxKXVhx4eBBsAD5RuCWuTuZmM8k
TKEDLtf8xfb5SQ7YNX+346s9NXS5Poy4CIPASiW/QWXgIHFbVdv2hC+cKOP61OLM
OGnOxfig6tQyd6EaCkedpY1DvSa2lPnQSOwC/jXCx6Vboc0zTY5R2bHtNc9hjIFP
F4VClLAQSh2F4R1V9MH5KZMW+CCP6oaJY658W9JYXYRwlLrL2EFOVxHgcxq/6+fw
+axXK9OXJrGZjuA+hiz+L/uAOtE4WuxrSeuNMHSrMtM9QqVn4bBuMJ21mAzfNoMP
OIwgMT9DwUjVAgMBAAGjgZAwgY0wHQYDVR0OBBYEFOubJp9SoXIw+ONiWgkOaW8K
zI/TMB8GA1UdIwQYMBaAFOubJp9SoXIw+ONiWgkOaW8KzI/TMA8GA1UdEwEB/wQF
MAMBAf8wJQYDVR0RBB4wHIIac3RvcmFnZS5zZWVkMS5sb2tpLm5ldHdvcmswEwYD
VR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAIiHNhNrjYvwXVWs
gacx8T/dpqpu9GE3L17LotgQr4R+IYHpNtcmwOTdtWWFfUTr75OCs+c3DqgRKEoj
lnULOsVcalpAGIvW15/fmZWOf66Dpa4+ljDmAc3SOQiD0gGNtqblgI5zG1HF38QP
hjYRhCZ5CVeGOLucvQ8tVVwQvArPFIkBr0jH9jHVgRWEI2MeI3FsU2H93D4TfGln
N4SmmCfYBqygaaZBWkJEt0bYhn8uGHdU9UY9L2FPtfHVKkmFgO7cASGlvXS7B/TT
/8IgbtM3O8mZc2asmdQhGwoAKz93ryyCd8X2UZJg/IwCSCayOlYZWY2fR4OPQmmV
gxJsm+g=
-----END CERTIFICATE-----

View File

@ -1,24 +1,25 @@
-----BEGIN CERTIFICATE-----
MIID8TCCAtmgAwIBAgIUSBKbYheHOBeL/hz2QWEjag093cEwDQYJKoZIhvcNAQEL
BQAwgYcxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJ
TWxlYm91cm5lMRAwDgYDVQQKDAdTZXNzaW9uMSMwIQYDVQQDDBpzdG9yYWdlLnNl
ZWQzLmxva2kubmV0d29yazEaMBgGCSqGSIb3DQEJARYLa2VlQG94ZW4uaW8wHhcN
MjEwNDAxMDIzMzA4WhcNMjMwMzE0MDIzMzA4WjCBhzELMAkGA1UEBhMCQVUxETAP
BgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlNbGVib3VybmUxEDAOBgNVBAoMB1Nl
c3Npb24xIzAhBgNVBAMMGnN0b3JhZ2Uuc2VlZDMubG9raS5uZXR3b3JrMRowGAYJ
KoZIhvcNAQkBFgtrZWVAb3hlbi5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAMJzm7p+HZmhgFo4s2xjwD5YatI2j363z0PxUZy8S1XS4TcCXQ8NNDHF
38IRhx67wI4lW4Y66JDpATtPh+FQv5TBkugKIFwTNqfCYcB7a+on4K2/rU9/CL8O
V3voh7DQs6kMijKG1JMR1A1Y1Qzyzo3SRupbGwuFOQCrcWUv+YvU8EffQDPR0vqN
Be1okHR2L3Dg556Zwx2mljgLq528qNAoqfkyrbV7NJzetVA43FKm4jfHN9tlkH4R
GP691rfs4MSVxVG5Sj2N7B93CD4gd3sIg2/Gxq04BYSNOQLro2a6zim3Uk3oU5W/
k5YDq4/VrM4+09ZJNS3LXSBxrsadNGkCAwEAAaNTMFEwHQYDVR0OBBYEFKppE5WH
aQqhNGU8AOyaQ27MReAqMB8GA1UdIwQYMBaAFKppE5WHaQqhNGU8AOyaQ27MReAq
MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJSMnGDQ6U+F0Ete
Jx8mHxvQy8/uZ1YhN2VR1w9vDNhOLaaqDx0Mx2DDpSOm06uVU3vltRX+jSgdjg2u
n8uLQfj/E/d8cnNjv1lnkVsvUvlOyMuYSNc0e69rAhQ++o8ll+zy4OLWAv4Z4GnH
VGX9oRWl3JOfE8BRKni+WcdXpR6xstASg0npR2jmcPMKLljHC/FVwK5cMWY7klZu
ZIfRzyWJofO9YQr0w9NLa3TH7O6C9PwDS0GKUZLESjmz0EnKMU9957K5Y8QpnU4R
VXsnny+FCPSQtCynUGUYtibl3g3c1fMswr0yyG1T5p4s0BB1y8TaLnxmrn9DvN3X
CQ5Rsx4=
MIIEITCCAwmgAwIBAgIUc486Dy9Y00bUFfDeYmJIgSS5xREwDQYJKoZIhvcNAQEL
BQAwgYAxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJ
TWVsYm91cm5lMSUwIwYDVQQKDBxPeGVuIFByaXZhY3kgVGVjaCBGb3VuZGF0aW9u
MSMwIQYDVQQDDBpzdG9yYWdlLnNlZWQzLmxva2kubmV0d29yazAeFw0yMTA0MDcw
MTIwNTJaFw0yMzA0MDcwMTIwNTJaMIGAMQswCQYDVQQGEwJBVTERMA8GA1UECAwI
VmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTElMCMGA1UECgwcT3hlbiBQcml2
YWN5IFRlY2ggRm91bmRhdGlvbjEjMCEGA1UEAwwac3RvcmFnZS5zZWVkMy5sb2tp
Lm5ldHdvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtokMlsFzf
piYeD0EVNikMyvjltpF6fUEde9NOVrTtNTQT6kkDk+/0HF5LYgPaatv6v7fpUQHi
kIwd6F0LTRGeWDFdsaWMdtlR1n/GxLPrOROsE8dcLt6GLavPf9rDabgva93m/JD6
XW+Ne+MPEwqS8dAmFGhZd0gju6AtKFoSHnIf5pSQN6fSZUF/JQtHLVprAKKWKDiS
ZwmWbmrZR2aofLD/VRpetabajnZlv9EeWloQwvUsw1C1hkAmmtFeeXtg7ePwrOzo
6CnmcUJwOmi+LWqQV4A+58RZPFKaZoC5pzaKd0OYB8eZ8HB1F41UjGJgheX5Cyl4
+amfF3l8dSq1AgMBAAGjgZAwgY0wHQYDVR0OBBYEFM9VSq4pGydjtX92Beul4+ml
jBKtMB8GA1UdIwQYMBaAFM9VSq4pGydjtX92Beul4+mljBKtMA8GA1UdEwEB/wQF
MAMBAf8wJQYDVR0RBB4wHIIac3RvcmFnZS5zZWVkMy5sb2tpLm5ldHdvcmswEwYD
VR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAAYxmhhkcKE1n6g1
JqOa3UCBo4EfbqY5+FDZ0FVqv/cwemwVpKLbe6luRIS8poomdPCyMOS45V7wN3H9
cFpfJ1TW19ydPVKmCXrl29ngmnY1q7YDwE/4qi3VK/UiqDkTHMKWjVPkenOyi8u6
VVQANXSnKrn6GtigNFjGyD38O+j7AUSXBtXOJczaoF6r6BWgwQZ2WmgjuwvKTWSN
4r8uObERoAQYVaeXfgdr4e9X/JdskBDaLFfoW/rrSozHB4FqVNFW96k+aIUgRa5p
9kv115QcBPCSh9qOyTHij4tswS6SyOFaiKrNC4hgHQXP4QgioKmtsR/2Y+qJ6ddH
6oo+4QU=
-----END CERTIFICATE-----

View File

@ -41,13 +41,18 @@ public enum HTTP {
guard SecTrustSetAnchorCertificates(trust, certificates as CFArray) == errSecSuccess else {
return completionHandler(.cancelAuthenticationChallenge, nil)
}
// Check that the presented certificate is one of the trusted seed node certificates
// Check that the presented certificate is one of the seed node certificates
var result: SecTrustResultType = .invalid
guard SecTrustEvaluate(trust, &result) == errSecSuccess else {
return completionHandler(.cancelAuthenticationChallenge, nil)
}
switch result {
case .proceed: return completionHandler(.useCredential, URLCredential(trust: trust))
case .proceed, .unspecified:
// Unspecified indicates that evaluation reached an (implicitly trusted) anchor certificate without
// any evaluation failures, but never encountered any explicitly stated user-trust preference. This
// is the most common return value. The Keychain Access utility refers to this value as the "Use System
// Policy," which is the default user setting.
return completionHandler(.useCredential, URLCredential(trust: trust))
default: return completionHandler(.cancelAuthenticationChallenge, nil)
}
}