From 0f3276ecc26b28075c64c2ea178d9ea92441510a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 31 Jan 2023 02:15:34 +0000 Subject: [PATCH 1/2] Update reseeds List updated to i2p/i2p.i2p@07a796bcf65e62438aa1671f69173bedb8a99951 --- .../reseed/atomike_at_mail.i2p.crt | 34 ------------- .../reseed/atomike_at_mail.i2p.der | Bin 526 -> 0 bytes .../reseed/backup_at_mail.i2p.crt | 32 ------------ .../reseed/backup_at_mail.i2p.der | Bin 526 -> 0 bytes .../certificates/reseed/bugme_at_mail.i2p.crt | 32 ------------ .../certificates/reseed/bugme_at_mail.i2p.der | Bin 526 -> 0 bytes .../reseed/echelon3_at_mail.i2p.crt | 33 ++++++++++++ .../reseed/echelon3_at_mail.i2p.der | Bin 0 -> 526 bytes .../reseed/echelon_at_mail.i2p.crt | 32 ------------ .../reseed/echelon_at_mail.i2p.der | Bin 526 -> 0 bytes .../reseed/hankhill19580_at_gmail.com.crt | 34 +++++++++++++ .../reseed/hankhill19580_at_gmail.com.der | Bin 0 -> 526 bytes .../reseed/i2p-reseed_at_mk16.de.crt | 34 +++++++++++++ .../reseed/i2p-reseed_at_mk16.de.der | Bin 0 -> 526 bytes .../certificates/reseed/meeh_at_mail.i2p.crt | 32 ------------ .../certificates/reseed/meeh_at_mail.i2p.der | Bin 526 -> 0 bytes .../reseed/r4sas-reseed_at_mail.i2p.crt | 32 ++++++++++++ .../reseed/r4sas-reseed_at_mail.i2p.der | Bin 0 -> 526 bytes .../reseed/rambler_at_mail.i2p.crt | 33 ++++++++++++ .../reseed/rambler_at_mail.i2p.der | Bin 0 -> 526 bytes .../reseed/reseed_at_diva.exchange.crt | 34 +++++++++++++ .../reseed/reseed_at_diva.exchange.der | Bin 0 -> 526 bytes .../certificates/reseed/zmx_at_mail.i2p.crt | 34 ------------- .../certificates/reseed/zmx_at_mail.i2p.der | Bin 526 -> 0 bytes .../certificates/ssl/echelon.reseed2017.crt | 24 --------- assets/certificates/ssl/i2p.mooo.com.crt | 23 --------- assets/certificates/ssl/reseed.onion.im.crt | 36 -------------- src/netdb/reseed.rs | 47 ++++++++---------- 28 files changed, 221 insertions(+), 305 deletions(-) delete mode 100644 assets/certificates/reseed/atomike_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/atomike_at_mail.i2p.der delete mode 100644 assets/certificates/reseed/backup_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/backup_at_mail.i2p.der delete mode 100644 assets/certificates/reseed/bugme_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/bugme_at_mail.i2p.der create mode 100644 assets/certificates/reseed/echelon3_at_mail.i2p.crt create mode 100644 assets/certificates/reseed/echelon3_at_mail.i2p.der delete mode 100644 assets/certificates/reseed/echelon_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/echelon_at_mail.i2p.der create mode 100644 assets/certificates/reseed/hankhill19580_at_gmail.com.crt create mode 100644 assets/certificates/reseed/hankhill19580_at_gmail.com.der create mode 100644 assets/certificates/reseed/i2p-reseed_at_mk16.de.crt create mode 100644 assets/certificates/reseed/i2p-reseed_at_mk16.de.der delete mode 100644 assets/certificates/reseed/meeh_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/meeh_at_mail.i2p.der create mode 100644 assets/certificates/reseed/r4sas-reseed_at_mail.i2p.crt create mode 100644 assets/certificates/reseed/r4sas-reseed_at_mail.i2p.der create mode 100644 assets/certificates/reseed/rambler_at_mail.i2p.crt create mode 100644 assets/certificates/reseed/rambler_at_mail.i2p.der create mode 100644 assets/certificates/reseed/reseed_at_diva.exchange.crt create mode 100644 assets/certificates/reseed/reseed_at_diva.exchange.der delete mode 100644 assets/certificates/reseed/zmx_at_mail.i2p.crt delete mode 100644 assets/certificates/reseed/zmx_at_mail.i2p.der delete mode 100644 assets/certificates/ssl/echelon.reseed2017.crt delete mode 100644 assets/certificates/ssl/i2p.mooo.com.crt delete mode 100644 assets/certificates/ssl/reseed.onion.im.crt diff --git a/assets/certificates/reseed/atomike_at_mail.i2p.crt b/assets/certificates/reseed/atomike_at_mail.i2p.crt deleted file mode 100644 index 1e724f0..0000000 --- a/assets/certificates/reseed/atomike_at_mail.i2p.crt +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -cGpnw4a2u9sHZIUNHzoGq32+7UWXsBI5Ow== ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/atomike_at_mail.i2p.der b/assets/certificates/reseed/atomike_at_mail.i2p.der deleted file mode 100644 index dbf5b2bb13fd6c8a1bdb5524c943c6209c536fc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{m!qJ--C1?xg<4#E|b4`kPl#520Xc`MA=AXiSiy8F8QWV4G zk0o2BeWTqcc{5H4sG@ha)}>Hn15-GGpHp>7&(QOl_t@8ExcEGAQI}bKlYlALW7Io% zV8YS+?mpxBL)s$YHp}HZgqG&X4KMD$GK^)CPSmQi=dm^%tKi6c4)&a9B$@h(kaczd zzIVf<74>wfP1M%-URnmy;Wap|SbUlS`k$}zrQ<262z8hfh1slG#5~wRi1`n0Rr291ObJjJW?d}=Y+eiN05v~Xd&K# QCCeQwv5!pw0s{d60U>(xtpET3 diff --git a/assets/certificates/reseed/backup_at_mail.i2p.crt b/assets/certificates/reseed/backup_at_mail.i2p.crt deleted file mode 100644 index 73b08ea..0000000 --- a/assets/certificates/reseed/backup_at_mail.i2p.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFfTCCA2WgAwIBAgIEOprmhjANBgkqhkiG9w0BAQ0FADBvMQswCQYDVQQGEwJY -WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt -b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEYMBYGA1UEAwwPYmFja3VwQG1haWwu -aTJwMB4XDTEzMTAxMzEzNDQ1NVoXDTIzMTAxMzEzNDQ1NVowbzELMAkGA1UEBhMC -WFgxCzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMVSTJQIEFub255 -bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGDAWBgNVBAMMD2JhY2t1cEBtYWls -LmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIoAkobXwk/Enf1d -roHyqCyvcJfZJVTwb/LgYWAvCBMCr+RGqlSgtk3g69Y3I0xU08fD2kGt3r5Pwsbr -omXIbJAcccyLqmQ5QX6QgL+X9VpMDp9C4h2RogCrqLBAWw4cuZ4RS9VCpP1Yis7H -uejYqENP86p7BsRnuW/4cYnfunAdMpss4LpRGQXt1nTX+kfgCYgnKFbFqwAHt7yV -Ds+Pe6FuBHPlp+sc1amKRcUnSvhXLsv43VicnT7xYL/kUsN83wrtHA3B4aGDx3aA -3/EzuRmIXQB0BlTZILMEyYwG/nc4OsW82QYrvEZ9BIg9A4lF/wS/KZCICPxLF2zo -dGjnmlgkiA4s8eO+va/ElHyELjckVXqmG1eXHhSkEsDvOQJy01IUuwLinvq7cUbJ -HfJBZJllEg+sLDCv3FkEqN+XjBNFfQN4oNew4w6IPY6YH1INVB9LL0Cmdu4DudLv -TY8OcI8eSfez3hmm+pYQ23PJRYYnvRDnRECyIWBegkckWRh8U/WvZUYUvETK6EDl -/0KpTtfzX6MqHA5D6bTAB8Y3ijGMLrZ/B5vj5yCoZbLiGme9X2moR2k1LEhdhtzV -exsqezCpg6dn48FTX7mHjvR5/r4kz2jqBGmdPUWIIxnjFUzDUK3llVQiHihleHpe -jL4LqnhBGKWFRTaVwaIkBG4zAfIzAgMBAAGjITAfMB0GA1UdDgQWBBQNkfW7bSMl -1/4KDbgwrkf9x1Zu/TANBgkqhkiG9w0BAQ0FAAOCAgEAGg3a3rTf0EznQocmio0T -5gCoL0n8h6yKW/PyPAIELrd9wiYjhJFcWvMTcJJJnVqmAL5vpvhaAFVtAfx70MGa -0DZ7FvytK5hEfF4IqOFDyEEVGJR5rIpVK4MeI1nmwEsxdbW+FhODjtRzgYO8XBME -Xj4aY1FWg9vxc3reUj6PSFsZtsB0aLiRgL9JDovJIiRw0Uqr1v2wXBte5yVCxDge -vTREZtpK4cKetoOa68pwSXI32JwKE18j6bfdKVBCcYQKlKP/3gHGduaDrQv3w32S -DRym5s6MREeTUOtAw4wq46KpdOX8yyAqJPrCfMwS6ORd3t+egqOw0PUnsqb97w4O -lUtrRYvb2cOj60SmRx4vJvItyuHbKqIK7o2e1RcUZPXYoAVx2ww4XB2Wk4D7LSAs -cS7nLj8yAqzJ2qqtBzxu+zILJtkVa12dKF0xmS0BxBp4sCYiBtmAVE8AWQqEuSHA -FrMWqoXcjcfdvvyX487FFWWUE7ZBIn0hee2sK9J9+SPtqczJaN7TF3K3nzo65WJG -1epltmq2Ugjb67Gz7v4y7H23DJ/qhm8yLtCHTj69HTta5I08j6Kut924WLZaiMO/ -4YoEL5AE63X0sxYibKFQiq7FW5nUJA280GRlY3xSMFzlB2ggazrUV3YAWVDhfdnI -flpzWXkFM2D36OUaubfe9YY= ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/backup_at_mail.i2p.der b/assets/certificates/reseed/backup_at_mail.i2p.der deleted file mode 100644 index 9c3e82488cb58090f216b12462ac51be96af774a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{miU5*^*TPT4o&8;|f%2#o%%1}nTqeFTU-1Bpfd1ivYe zhzR^k7i{QsXy=+(B!~_y@#DU|uf&vmgf2HEReGiySC<|Xq!PgIIRbLiQWU!a;-31u zaYo4<@$wh`Iy%6U_K(ZlVUV=v?Sr~j%^{-_{6ud;r=s@NFLa9#I z^IxMX91cV2w7>_(H;OTgF1CLMo8#vosAaO^8fU#iWt>u+eA|5DZczRxpz6+{&K^UclMK+be Qq9g=vGXe550s{d60kNg};s5{u diff --git a/assets/certificates/reseed/bugme_at_mail.i2p.crt b/assets/certificates/reseed/bugme_at_mail.i2p.crt deleted file mode 100644 index 2b6acac..0000000 --- a/assets/certificates/reseed/bugme_at_mail.i2p.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFezCCA2OgAwIBAgIEUQYyQjANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY -WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt -b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOYnVnbWVAbWFpbC5p -MnAwHhcNMTQxMTA2MDkxMTE0WhcNMjQxMTA1MDkxMTE0WjBuMQswCQYDVQQGEwJY -WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt -b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOYnVnbWVAbWFpbC5p -MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCrThOH0eSDT0VnCSBC -sqYmAydWH+O8eNttDXr2mSvZLhvAW+6/xHTkKhaWvkIvvS0Vh8hujMnD90Cgp4Fk -TKCxMj9K527o5xIZwWW05OevbjlBwIpVLO1PjmsfsoD1nIX14eEzJSEoAulKsv7V -jGUC/6hC11mmVvH9buQLSRv6sCjuAcMszmw3TAD+XYBIs+z57KuwYXtX3+OA543c -l1/ZKLYkkwY8cwzZqWDVWqTKP5TfVae58t40HhJk3bOsr21FZsaOjlmao3GO+d/3 -exKuUGJRcolSqskL3sZ1ovFqko81obvvx0upI0YA0iMr/NRGl3VPuf/LJvRppYGc -LsJHgy9TIgtHvaXRi5Nt4CbKl9sZh/7WkkTTI5YGvevu00btlabAN+DSAZZqdsB3 -wY8HhM1MHiA9SWsqwU65TwErcRrjNna2FiDHEu0xk5+/iAGl6CSKHZBmNcYKXSv8 -cwShB0jjmciK0a05nC638RPgj0fng7KRrSglyzfjXRrljmZ40LSBL/GGMZMWpOM7 -mEsBH5UZJ/2BEmjc9X9257zBdx8BK8y1TXpAligpNBsERcTw1WP1PJ35einZvlXW -qI3GwMf0sl26sn+evcK0gDl27jVDZ45MtNQEq64M4NV3Tn9zq0eg/39YvjVeqrI5 -l7sxmYqYGR6BuSncwdc4x+t6swIDAQABoyEwHzAdBgNVHQ4EFgQU/REZ7NMbVZHr -Xkao6Q8Ccqv2kAMwDQYJKoZIhvcNAQENBQADggIBACc2YjLVNbl1kJUdg2klCLJt -5LjNTiIZa2Cha5GStlC/lyoRRge6+q/y9TN3tTptlzLPS9pI9EE1GfIQaE+HAk+e -/bC3KUOAHgVuETvsNAbfpaVsPCdWpFuXmp/4b9iDN7qZy4afTKUPA/Ir/cLfNp14 -JULfP4z2yFOsCQZ5viNFAs1u99FrwobV2LBzUSIJQewsksuOwj96zIyau0Y629oJ -k+og88Tifd9EH3MVZNGhdpojQDDdwHQSITnCDgfRP5yER1WIA4jg6l+mM90QkvLY -5NjWTna5kJ3X6UizvgCk365yzT2sbN3R9UGXfCJa9GBcnnviJtJF3+/gC0abwY2f -NtVYp32Xky45NY/NdRhDg0bjHP3psxmX+Sc0M9NuQcDQ+fUR+CzM0IGeiszkzXOs -RG+bOou2cZ81G4oxWdAALHIRrn7VvLGlkFMxiIZyhYcTGQZzsTPT6n18dY99+DAV -yQWZfIRdm8DOnt0G+cwfeohc/9ZwDmj4jJAAi0aeTXdY6NEGIVydk6MAycEhg2Hx -9EV96kRwZNIW0AGY8CozECFL3Eyo2ClQVV4Q35SsBibsitDjM03usc2DJ/qjynXA -C8HoOSWgbddiBvqZueqK8GdhykOy3J3ysr+MNN/lbG48LqkQr1OWxev9rGGQ6RJT -wpBgPyAFAwouPy1whmnx ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/bugme_at_mail.i2p.der b/assets/certificates/reseed/bugme_at_mail.i2p.der deleted file mode 100644 index e47dcd2638a340586aad5eafb84284e7db544877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{mt4+aJ=?Ukm$H{j9% zmTGpucfpSbgw0GIAU#QID#1>-)pt&RbE`+7|9@D%HD0Q+IhVUJnTnVh9)YZyB{}hoYfL*Ek8U{ym(+ye@Y4 zBc2?#_PocRps^`9b+Nyg%MKxzq!y+LCe8l4+&O+@m?OLW8dNLoNJJZRFpQo;k5c9> zS#$q_z@?hQN!^LR0u*#&_fc;?ZdQ|cBg!Eg=CL=C#*JV(69r^_9fN;++i6PeConow zlwa5&%@rkJDX*S131nhKQiJ;O3}clCKLlCO;PEUC(Nuw$2G^Q7eW|&^mW;AtRZEk%g1fmy;>7~ z6lUO&^hqQ7UZf`9nD{h}QkGFH4tqBD1vf?RFgapE35ib|aIIr~f{J_)MulLuB4pRa zy!iZZ?!ZN>%M0Ya8T*#O>U87<^?K~;*%@N=i+(uG0W^Djh_JY!`<1e*4v|SCGO_99 Q-Kl3#A4I%O0s{d60ZDcEiU0rr literal 0 HcmV?d00001 diff --git a/assets/certificates/reseed/echelon_at_mail.i2p.crt b/assets/certificates/reseed/echelon_at_mail.i2p.crt deleted file mode 100644 index ad10e3a..0000000 --- a/assets/certificates/reseed/echelon_at_mail.i2p.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFfzCCA2egAwIBAgIESg3kkzANBgkqhkiG9w0BAQ0FADBwMQswCQYDVQQGEwJY -WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt -b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEZMBcGA1UEAwwQZWNoZWxvbkBtYWls -LmkycDAeFw0xNDA3MzExNjQ3MDJaFw0yNDA3MzAxNjQ3MDJaMHAxCzAJBgNVBAYT -AlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9u -eW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRkwFwYDVQQDDBBlY2hlbG9uQG1h -aWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmcEgLwwhzLNe -XLOMSrhwB8hWpOhfjo4s6S/wjBtjjUc8nI3D0hSn3HY26p0rvcvNEWexPUpPULmC -exGkU463nu7PiFONiORI1eJAiUFHibRiaA7Wboyo38pO73KirwjG07Y+Ua0jp+HS -+4FQ/I/9H/bPplReTOU/6hmRbgQ69U8nE68HzZHQxP68yVJ2rPHSXMPhF4R1h0G1 -1mCAT+TgTsnwHNGF77XHJnY4/M4e2cgycEZjZow36C3t2mNDVkMgF19QQeb9WmLR -zREn3nq9BJqHpUkn9yWw0kKXTZSds+7UxESfzf3BzK0+hky2fh5H+qbYAo2lz4yj -81MXTAu+4RRkg4DBLlF+2dkclhwQLxxzvkRC6tPkn5i33Yltg7EfzA9IoQ05potJ -I+iOcF+aStfFgFj9u3B5UkcF4P0cH1QD3c6BK4hIezQYqRoPly1gHqg+XdwjG/dr -4as7HA9FTz3p2E8nClpIC1x3hfgwAdfd29aeBxO1WW/z99iMF7TBAF+u5T86XEW1 -WpknqCbTli36yJ8a5fPWxZHrryBRJT5yLxejjFeadtutBSwljiVFq+Y38VqwFivq -VLiBt7IxAsZ8iilgfnnnAvBH6chWfSKb4H7kB4TJvDiV96QmmvoEaWYNHZozMhyK -tO3b5w+xqbJXyCLA3Q75jD0km76hjcECAwEAAaMhMB8wHQYDVR0OBBYEFAHQcAam -QRS/EUhuCSr9pB4Ux0rYMA0GCSqGSIb3DQEBDQUAA4ICAQBq1+1QLmgLAjrTg3tb -4XKgAVICQRoBDNUEobQg3pYeUX9eFNya2RxNljuvYpwT80ilGMPOXcjddmr5ngiK -dbGRcuuJk9MPEHtPaPT3+JJlvKQ3B3g2wva2Wz2OAyLZUGQs389K4nTbwh4QF0n2 -aHFL8BHiD62hiKnCoNaW4ZovUNNvOxo9lMyAiaFU2gqQNcdad8hP9EAllbvbxDx9 -Tjww2UbwQUIHS9rna4Tlu+f0hDXTWIutc2A51W2fJCb7L3+lYO7Wv55ND/WtryLZ -XpMp27+MpuEnN3kQmz/l9R0hIJsWc/x9GQkjm5wEaIZEyTtenqwRKGmVCtAj0Pgv -jn1L3/lWmrNq+OZHb/QeyfKtA3nXfQKVmT98ewQiK/S5i1xIAXCJPytOD887b/o1 -cdurTmCiZMwgiQ+HLJqCg3MDa5mvKqRkRdZXfE6aQWEcSbpAhpV15R17q7L+Fg0W -shLSNucxyGNU8PjiC/nOmqfqUiPiMltJjPmscxBLim8foyxjakC4+6N6m+Jzgznj -PocBehFAfKYj66XEwzIBN7Z2uuXoYH9YptkocFjTzvchcryVulDWZ4FWxreUMhpM -4oyjjhSB4tB9clXlwMqg577q3D6Ms0zLTqsztyPN3zr6jGev3jpVq7Q1GOlciHPv -JNJOWTH/Vas1W6XlwGcOOAARTQ== ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/echelon_at_mail.i2p.der b/assets/certificates/reseed/echelon_at_mail.i2p.der deleted file mode 100644 index 1157104ce715c3c45d163195e1721393d3edb084..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{mnZY103?a<3UR<+`O1N+b$X2B2UyhC}=`Zk%8)J<}Je-Zg z(iErMb~fsrE4|Cj5ofVIN>5O^f_o99Q;xTu?$3x*jfmt()#5;jK}U(SVrUN5Zj7kk z%1-ZcqOS{Ez(~_RpqNUQFdb>KT!41UmIkCljv+&5_W={=CUj zcC7KzT*KiPgms5Owbo#OPvqcE$?zP}h3~b;CU!Xd&K}vwGH^y?W{fxJE$!N4Lsml| z7hh08=KWe?(ajMj-g>eJ+(n77@DZG*8N%nwMR4LPQZ zNh9cva9^5A*TsNX{kw2^Qbz^g{Tv@u1KrMnD~L#YG#IHG50@=q9;iND+#?(JYvHRq z91lfLJ?Yp_Ckk3f3tV@F_%H$2-P_il2NShfZ}a!qj2E=Q0AH@QuOax3Vz;#(at? zV19Y$0`N!a$X0zKo8W%r2ZYJIIFCXbeISi``|Rmg8vt4;?t)kCi0$X*c%e;T?2)|b z_mja+sm<|Y0?iRSX-%tQ`~xD`DPyNT#cP`3n3rcdH%-{^({% z7wJ<}GAb4F(4z%1+B_)|e)N=ml@dW{s>>w)X3^1~-Lo2O3Rh?yP{L){XpKFm?t zD=8oR6~+Xk>u?2M99Mfik~@y(JXM3<`a|J^-!SNl7@mRc*5yR_egD9oZYCy?IXtG# zxbKQmIXYMl0o3=dc0nA*L%6jDGSQ%OemAlZ*Pix^UEw$l)#_N|2}dC0LTho<7GYU; z)mbqIF~a`bM?DJtOX${~@5~X+8@32={LN@;`rG-dvmM#wUEX0&BTr?H!=M{v z(7&zp(QC)Nj!b%UU5$v#sN~TLH3`_8E#MYxygXxBi3hPJT-8I7&TWfAXm)Iy+k`FV Q^ICv3Y&vEa0s{d60eip);{X5v literal 0 HcmV?d00001 diff --git a/assets/certificates/reseed/i2p-reseed_at_mk16.de.crt b/assets/certificates/reseed/i2p-reseed_at_mk16.de.crt new file mode 100644 index 0000000..3d1c452 --- /dev/null +++ b/assets/certificates/reseed/i2p-reseed_at_mk16.de.crt @@ -0,0 +1,34 @@ +-----BEGIN CERTIFICATE----- +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 +2Q== +-----END CERTIFICATE----- diff --git a/assets/certificates/reseed/i2p-reseed_at_mk16.de.der b/assets/certificates/reseed/i2p-reseed_at_mk16.de.der new file mode 100644 index 0000000000000000000000000000000000000000..dda48a8b06c77752ceef618865aa33aec931a0d4 GIT binary patch literal 526 zcmV+p0`dJYf&vNxf&u{m#xb*C_QsQc@wrB83&536LwaGz#0pLm28%WLd}s^m5zu(l z)ar8{6d%Q0g(@qUC*%tEv$(;|_^pRuxS81LGk5pw$gAI!cn3@6Bf`od#AeUbm2 zDULewp`dfzl4vvj?z#q9?n#BjARP*PG8_U_n27N48gL$&Ix{7Oz)@2k6w5wfPH>3$ zGtTd?q%HNv)=R5MGH55@5-m^mJ%mgDDIamL>1~c5i2=vx&P*F0BkE!5p;_H!liPC< zS1ES^JBa*Y-E%bY57JsXe)yEKJ|26#!Flq|)mD)+0ph?X&Np5jOU(}?HPZB&H$mqa z_&UzuE>S9lLg>X8#bEJ}oU$JVqUE2>fbWahqxP5a$IJRqAiLMnI497c7B#1zVd{H5 z-#f>}x>h>XQ}PHVY2pHwY>kp31OK0xGkL}dMzUynZ>wSP5dHiyMC&h`cfvb>`gY#P zEgP5H&V~$(HmNJm*EUrGDh$CW_w*nmD7*vw7*j?g4wjaczoHhZJ6^rGnjov&9XaU6 Q`3A5$p56js0s{d60r%$tcmMzZ literal 0 HcmV?d00001 diff --git a/assets/certificates/reseed/meeh_at_mail.i2p.crt b/assets/certificates/reseed/meeh_at_mail.i2p.crt deleted file mode 100644 index 6014c96..0000000 --- a/assets/certificates/reseed/meeh_at_mail.i2p.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFeTCCA2GgAwIBAgIEZZozujANBgkqhkiG9w0BAQ0FADBtMQswCQYDVQQGEwJY -WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt -b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEWMBQGA1UEAwwNbWVlaEBtYWlsLmky -cDAeFw0xNDA2MjgyMjQ5MDlaFw0yNDA2MjcyMjQ5MDlaMG0xCzAJBgNVBAYTAlhY -MQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1v -dXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRYwFAYDVQQDDA1tZWVoQG1haWwuaTJw -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnVnmPE4uUvCky0yCnnVH -cJEDqzwDPupx0zr0YDlhZk5VOPPecx5haayJ/V6nXPc1aVVWn+CHfedcF2aBgN4K -5aBueS/l6l5WHcv02DofAqlTmyAws3oQeR1qoTuW24cKRtLR7h5bxv63f6bgp6e+ -RihFNez6UxErnRPuJOJEO2Im6EgVp6fz7tQ7R35zxAUeES2YILPySvzy2vYm/EEG -jXX7Ap2A5svVo90xCMOeUZ/55vLsjyIshN+tV87U4xwvAkUmwsmWVHm3BQpHkI6z -zMJie6epB8Bqm0GYm0EcElJH4OCxGTvDLoghpswbuUO7iy3JSfoL7ZCnoiQdK9K4 -yVVChj8lG+r7KaTowK96iZep+sZefjOt5VFGuW2Fi/WBv3ldiLlJAo/ZfrUM4+vG -fyNBXbl6bX87uTCGOT1p3dazo+zJMsAZ+Y93DlM/mDEWFa1kKNrs74syzaWEqF4L -KQE6VoYn80OOzafSigTVQgSwUtQtB0XGhMzJhyxU2XHWe1LFIy7Pta0B+lDiZj7c -I8nXxYjsDfEu/Elj/Ra9N6bH0awmgB5JDa+Tbir+oEM5SyDfpSaCGuatdGxjweGI -kVmFU0SqCZV/8TXbIu6MUVzTZMZVT94edifFSRad4fqw7eZbSXlPu++3d1/btn6h -ibM04nkv0mm+FxCKB/wdAkECAwEAAaMhMB8wHQYDVR0OBBYEFO7jIkSRkoXyJcho -9/Q0gDOINa5EMA0GCSqGSIb3DQEBDQUAA4ICAQBzfWO7+8HWOKLaYWToJ6XZbpNF -3wXv1yC4W/HRR80m4JSsq9r0d7838Nvd7vLVP6MY6MaVb/JnV76FdQ5WQ6ticD0Y -o3zmpqqbKVSspN0lrkig4surT88AjfVQz/vEIzKNQEbpzc3hC2LCiE2u+cK/ix4j -b9RohnaPvwLnew5RNQRpcmk+XejaNITISr2yQIwXL7TEYy8HdGCfzFSSFhKe9vkb -GsWS5ASrUzRoprswmlgRe8gEHI+d51Z7mWgna0/5mBz9bH/3QXtpxlLWm3bVV+kt -pZjQDTHE0GqG2YsD1Gmp4LU/JFhCojMTtiPCXmr9KFtpiVlx06DuKm5PC8Ak+5w+ -m/DQYYfv9z+AA5Y430bjnzwg67bhqVyyek4wcDQinFswv3h4bIB7CJujDcEqXXza -lhG1ufPPCUTMrVjh7AShohZraqlSlyQPY9vEppLwD4W1d+MqDHM7ljOH7gQYaUPi -wE30AdXEOxLZcT3aRKxkKf2esNofSuUC/+NXQvPjpuI4UJKO3eegi+M9dbnKoNWs -MPPLPpycecWPheFYM5K6Ao63cjlUY2wYwCfDTFgjA5q8i/Rp7i6Z6fLE3YWJ4VdR -WOFB7hlluQ//jMW6M1qz6IYXmlUjcXl81VEvlOH/QBNrPvX3I3SYXYgVRnVGUudB -o3eNsanvTU+TIFBh2Q== ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/meeh_at_mail.i2p.der b/assets/certificates/reseed/meeh_at_mail.i2p.der deleted file mode 100644 index f6d59678e23ea0e04d9c5878c5662fd4d3580c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{momu8QPA*dLq{~c#o^?lXkprtd13v0;(>nBEIbmi_RXFqB za~@%7tcm?zr(E|nX;oIA;D>$ZTo-16fZht_pl*3DDL~C`C2w`cn}rofGaP;zT=QCg?~Nr>FDo)H_Fh zbHoK65iOV?v+_#(^4j(${6Pkdb^8LHfac59quntG!=6!}`R4NMk0LCD->p~9)Z-j4 z0!1dm$(B@kw*?AEkdCv=!eV=;sRzJnn?abHK^ziNN8sSG89T!+h#{uT8@WTfi!I4X z`U~xlr=lbsE7G{hRYHb8B^&DdDWvGYuX>4>srtrVelxA*QAW9Kg^Trpzjug zs9p;x0XkNOC-Xy&&8O0e1l2+Wuu{}52Svt&%*lr=RM~OXds4+CF3+{C0s2tlW<#fQ{7GZ|7QHv7$I+}NfF4N=uaj;n{-8rSOCaB+CW0E~t#oW-!QqIJS%p(X zstJ{U@ip5b?u=1f(`3d~Pu?DOC&ft?o#Fbh?dDrac~86Vw|8ILwtk_Bvozv)FVbng Q7Z8dE{2c;80s{d60c?x{fB*mh diff --git a/assets/certificates/reseed/r4sas-reseed_at_mail.i2p.crt b/assets/certificates/reseed/r4sas-reseed_at_mail.i2p.crt new file mode 100644 index 0000000..850b1af --- /dev/null +++ b/assets/certificates/reseed/r4sas-reseed_at_mail.i2p.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFiTCCA3GgAwIBAgIEY2XeQjANBgkqhkiG9w0BAQ0FADB1MQswCQYDVQQGEwJY +WDELMAkGA1UECAwCWFgxHjAcBgNVBAcMFUkyUCBBbm9ueW1vdXMgTmV0d29yazEL +MAkGA1UECgwCWFgxDDAKBgNVBAsMA0kyUDEeMBwGA1UEAwwVcjRzYXMtcmVzZWVk +QG1haWwuaTJwMB4XDTE3MDYyMjEwNTQ1NFoXDTI3MDYyMDEwNTQ1NFowdTELMAkG +A1UEBhMCWFgxCzAJBgNVBAgMAlhYMR4wHAYDVQQHDBVJMlAgQW5vbnltb3VzIE5l +dHdvcmsxCzAJBgNVBAoMAlhYMQwwCgYDVQQLDANJMlAxHjAcBgNVBAMMFXI0c2Fz +LXJlc2VlZEBtYWlsLmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB +ANgsj5LhF4uGG4RDueShqYQZsG5Rz6XUAtK9sVGFdmdJTDZirUMZcCGCGZP/Harz +QaZU9EYxOCztnpLCQksSCpdRsij56MURS0tW/1x7LHIDUOi911Of57jgIHH+3E5n +6tuRxEk6J/9Ji3PI+89kl0sPKMVFMyKkINprVTA5zr/keyYEG0p6HSEYYiJkQH78 +8uoOCAmlk9mxkJFb+zviCk6jsYwdH+ofD6Lw5ueOlYUbeZ9Nd7jfSdf20XM7ofIw +W2COtsbq3J7vNrQJMV7HkHxVx/7OqmjQF02OahZFZREVZqbHpL501iTn9Iqd5qKq +IsxYjk7ZnP4UUCBk8NOU5TuWsy0qNw+TJDI9s55Fi4KPtXWf47HIl6CdpM5y/D5L +eufCojSwPKlrD6x9gTyJdBggBZRIyplXdKffo/95hUhEkv86yfsVVR7Gu1uy0O8T +Gtb8Da/oi5eEZBHWonLVicLPei5jeo+1gbR09PQ6s41uMZlOhMe4RSgiIQj/7UVo +ffKdl1MPNKr1u2fgVj8kxqg8ZivWKQ2taEgimU2EkQcNcE96M9yQlNNpNvqSAQVk +wYXlHt0AN6A1A8u1pItxaTwXnbmx+OBJZoKl4ZQeaC8wtKjTgAgVXp+g5iot2gir +LjxCRx1WLG1c8vRg1W8CDZII8Swc8EWpMhI+0hPv7/4/AgMBAAGjITAfMB0GA1Ud +DgQWBBTN5sKbrNzwE8sgMGDekfOPgX8/JDANBgkqhkiG9w0BAQ0FAAOCAgEAjLaB +bHqvFTs0ikAtesk9r8+8XVIsP5FR57zZCek2vxkHcCQWw8Uqs3ndInRX4FirKSLT +WRb4aSwFCkrmwueecTpXN/RBC+fZj+POCfdILEsA+FGreAM2q5ZXv/Q0jyIXOXEM ++KL0JZXnNS0/dqR3IYbC7f39CL6Sf40gRGTwTWWGg3KnynoS0v1zQcZLTMhHBD2X +tgdIPbroq9t4gXa7Dhm0egYfQOI/7re2wiZT7UWVVwEpYqKf6JApFHa1nNOFMrLF +45JHQIHArkoxpQdfSe9HBoyJiB5vz398rHZeqbJaF3PIg9rxWWY/NvvOVuIk8U5z +0jExhg29a88B32U7ndvQJqIuGiQghzCiLxC/y1+wAdpeDSbD3OAOHqplvMj3BUn9 +yhDSLSjtfBJjnXKxtEcWLR0edHCGEk5mAcL7q1WNxDpxaICwGGpNZN53CtFx7amb +egYil448DmiqoQTCTE9pBz8YjwiVfCYLYv17O0NJyYM9Efy/wL3rFlsPJniWHMuH +imZybVU4ukjvfOZ+LY4COTwz6w4sfA7a+i+2mOynC7eKX8Yg6i1nXlcY1Z8ykNgi +7B3kz1T/DV56CIm6QUWtepfuKTYq4C6QrBBIXLk1d5g95aWA21u1LRqNZ9GLH+eA +gfvIm7v+cELj8a53EQY0LafzZqNC5kQAp916coU= +-----END CERTIFICATE----- diff --git a/assets/certificates/reseed/r4sas-reseed_at_mail.i2p.der b/assets/certificates/reseed/r4sas-reseed_at_mail.i2p.der new file mode 100644 index 0000000000000000000000000000000000000000..b9398a405b25f52d1e264cea6bb6d230c84a3076 GIT binary patch literal 526 zcmV+p0`dJYf&vNxf&u{m*es8d;TMaB8-zo-JA7ArIXpQkda&aJK_pXqp^$~AL<_uqVVSDj+KQQd7n*pxZg?F_R(`Yq4F?W zV2-xN>fE01Hna&bUdNDpRmc9$s%X#`O^#|7MP(5cW~RrazI4_k=k$u5=Ax=1%vg?2 z*_{3qP#|RR)0E{qma{D?HxH8}GCi}NMT>%uwRNB4vB;O8outlk{60&1=fa{iuso@2 z53GHGJc)D|AO)02%9&Smr{AOhd4)(slK(o%`xR9l#=Bdx(C-r(*8B~x=!=(xWD(Y) za@C2#&w4IndXKe%v~=|JI?L}yP@|~Ac4>YRvyJz55KP1Me zJZ3A_DGjY?NFtd{gpmgga8G(O+>n&hX*T+j0R?2ih2)!+aM za?_WMj_+XycF_G*Ww2yjjks6<%{|NzSvWm>6q6p&tOMAHyCjQ_*H{H@)UUjK@?l6~Tt#Dc^V`85I7eOoiK zyOEL~XQza8#aUDFK(HoeJYo+sz>&F8*HZz>IVG#Zv8CWx%p7O>kZy)blz-v@)F*CB zUh#){7`|tjH)vK4~B>6S`awUO1Nn5h+2zjql*3`2M`h$ysblF2Xzu7FFw zu<)BX6t;Bx5O@RD+2SlD?%hf>(TM;qs^!1@*9cs0AfFJx=V@S(?LoehtMhb;lq%{F zATsFUt!IyNpT0t>W6xMw^l$MzZyN45m*09SQ%;L1z0oaCjbL3$q=fAElg6im|`485QXKjZ_FVzjS>?B1(jNtzI#0OTw!8 zwb^S@muuxx9d$g7B@juX2HE&_MDk}SC2gf$5F}zQ$`WoH;6x33yBkE*#nL~Y0H3#H z=65@Ej2_E6iV5XOub_!ordIO)CWku0l(WW{jXnOR^JfG*^)HF>Sa{&QPMDFdB(3`U Q;6Yr_we&uH0s{d60a_md!~g&Q literal 0 HcmV?d00001 diff --git a/assets/certificates/reseed/zmx_at_mail.i2p.crt b/assets/certificates/reseed/zmx_at_mail.i2p.crt deleted file mode 100644 index 41f4cc7..0000000 --- a/assets/certificates/reseed/zmx_at_mail.i2p.crt +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -fNr8P7NIRyZ8 ------END CERTIFICATE----- diff --git a/assets/certificates/reseed/zmx_at_mail.i2p.der b/assets/certificates/reseed/zmx_at_mail.i2p.der deleted file mode 100644 index 8d4d096a463e88bdc4ec87781d37ab20c603d683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dJYf&vNxf&u{mrwnCOh%Tu#o#uX~Q9*zLQM5Wq0yO6+cRj2JsS4(aZR-zC zQd|&)`=<61kT_FB;T9WaaBP%0yFo9$J;zPbQHK_WN!d29v#$3211ef5T1dxW;}t(I zL8oWZUiEO+qQe#STRAlX?xu&-g+B55fH8eZ3MK8<7%F-FFRfMX8^`tV;%6!%^ep#@ z@i#~Xs54{9lpNc;UaiRiJ>YxDb(m@K!9VNyB3oP|N~_cL*V*C&E@X3sSiiByZL;0u+`JO&w=bd7ktR!YY|JeU*s(hW~(0& zQ2Woz=B>lIrF}>I+hzqx`*w^FF*KY4J=j;e;bcuj$dlF=a41v>Bl5pq;CesL1Mk0u z*jOX^2(!Qyv7%$j)at=az}WkBLWm6UQtU{bjbpeH&ObWxe8^{muAyf0D>`RO{o6uD z2d<+n42aRMR?fNHTf1-DdVX*52tB}0Zdd;pHW*qc2OlKmdO3H+F^8P=GlW%J#0clu zQGNMV+5f|_I!Pk?8t#x0YvKcdU)gYB)qz*hnn6&;J!=DV?C{_FKbRUy(CR1eEcLy- zb+?vkE=6qU;h12Pw3y3 QZ~H*2p-U0p0s{d60qqh45&!@I diff --git a/assets/certificates/ssl/echelon.reseed2017.crt b/assets/certificates/ssl/echelon.reseed2017.crt deleted file mode 100644 index e7b58bb..0000000 --- a/assets/certificates/ssl/echelon.reseed2017.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEAzCCAuugAwIBAgIJAJzD01zwSBKsMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD -VQQGEwJERTEQMA4GA1UECAwHR2VybWFueTESMBAGA1UEBwwJRnJhbmtmdXJ0MQww -CgYDVQQKDANJMlAxDzANBgNVBAsMBnJlc2VlZDEeMBwGA1UEAwwVcmVzZWVkLmky -cC1wcm9qZWt0LmRlMSIwIAYJKoZIhvcNAQkBFhNlY2hlbG9uQGkycG1haWwub3Jn -MCAXDTE3MDIxMTE5MTUyNloYDzIwNTAxMTMwMTkxNTI2WjCBljELMAkGA1UEBhMC -REUxEDAOBgNVBAgMB0dlcm1hbnkxEjAQBgNVBAcMCUZyYW5rZnVydDEMMAoGA1UE -CgwDSTJQMQ8wDQYDVQQLDAZyZXNlZWQxHjAcBgNVBAMMFXJlc2VlZC5pMnAtcHJv -amVrdC5kZTEiMCAGCSqGSIb3DQEJARYTZWNoZWxvbkBpMnBtYWlsLm9yZzCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALX9QXseJD1t0FeAK4YysZaIx1mv -uOnpFjmTeR06perdAX/2N7sKyJpcTo1CCEaDf5CxADAIr6Bt9IkCfvLYQRIV8TM/ -bVF7W52sW8PyHC2jEx/s28hp4UtYasPISt+QYT9ByOgcV02/InGE9FwnXi6mvKvv -0VeC71OiMBT/I9Z5Z+VknapdM9D+kYXT3+pjjneSxn2XZ7kfnegydQ0J63nrGOi7 -Lj4Syj84GtPc0Bgv4QLvmB+70X2Qr/X1TZt7QuxqFh0StgdQU1pT4r9PRgzcA4FN -NScPbcPUycmvBptbel31z2s7jos9AnGeWvVd63y8bbRpVzGft51yZtcUDo8CAwEA -AaNQME4wHQYDVR0OBBYEFLzp7fVErgTYTMqLdh8uHlr3kDDYMB8GA1UdIwQYMBaA -FLzp7fVErgTYTMqLdh8uHlr3kDDYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL -BQADggEBAKz+q73JpbqNjjXtg2/A+AXoOOhLd6Qah8a2AtiB/H2RevWem/09J1sb -VIkW4/YT6GLGg8UbHJLzlQxs8Apk2J0ebWTeQZOvy07tADKMrItrKyEY/HZk7d2L -7Dnz0QJ/JoJJBmjqQxFtZ2um0FyoT/bvxg03pJv0ZCQWTNpZcez0jHqMTdN1DqSJ -2oN163rHrINyCGGAlm1x1O/SKRWA4bD7CBBasarilYb3gbjSVZiuSF9zw8zl0KRh -AH0AqQ2sOSoyY/t5d03YEKMwzM9yQ9MZ0mB34TgiqgRJmKH4nSep0ARqp14oeagA -pZjtThe6YgidpmH1UXFYbRzHxU4NYCk= ------END CERTIFICATE----- diff --git a/assets/certificates/ssl/i2p.mooo.com.crt b/assets/certificates/ssl/i2p.mooo.com.crt deleted file mode 100644 index 839767b..0000000 --- a/assets/certificates/ssl/i2p.mooo.com.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDvTCCAqWgAwIBAgIJAOeW0ejPrHimMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV -BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQHDARub25lMQ0wCwYDVQQKDARu -b25lMQ0wCwYDVQQLDARub25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkq -hkiG9w0BCQEWBG5vbmUwHhcNMTUwMjA4MTczMzA5WhcNMTkwMzE5MTczMzA5WjB1 -MQswCQYDVQQGEwJVUzENMAsGA1UECAwEbm9uZTENMAsGA1UEBwwEbm9uZTENMAsG -A1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTEVMBMGA1UEAwwMaTJwLm1vb28uY29t -MRMwEQYJKoZIhvcNAQkBFgRub25lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAqxej7oRl9GOb8benIBCENrJXoow1iWhI9M+2nU0SaonrCDql5M2YMlwd -HzYUWtFbRjz2NinjB0fgFq9cfzHfr1Sc8k/OeGg1jvNfqt8wWo9tryQNjiHtDQUZ -6lQ5T13I+lj0CBasowgbApKQfrYjvaeuTaVYTfP8IVA60hoUQ+sy9JN+Unsx3/0Y -PLLd98+bT27qYuBNRB1g/ifUTd9Wosj2PevGBlCxYDaUjmCG4Q8kcQr87KvM6RTu -3AV61s/Wyy1j2YemlGG/ZhJ44YnlVMSu1vTjt9HInVf3lRRx/+RzbQO3lqeVC8LC -Bq3KbSlfJVx4vHslfHwBFw9A4rmD1QIDAQABo1AwTjAdBgNVHQ4EFgQUsSUvX0ED -yivB67iksVwZ+b8vLtQwHwYDVR0jBBgwFoAUsSUvX0EDyivB67iksVwZ+b8vLtQw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAde4wts7Q8TylFEc38ftJ -2f285fFIR7P1SSbBcHPK2eBwLEg0zJyFrCeiHuEpPrn+d5GqL2zOskjfcESGmDBT -aFajj8jPBJj/AmpkdWJG6a1YKro5tu9wrlenGwHOHu2/Cl0IJvafxrOs2x4G+2Nl -5Hcw/FIy8mK7eIch4pACfi0zNMZ6KMCKfX9bxPrQo78WdBfVjbrIBlgyOQJ5NJEF -JlWvS7Butv7eERi4I2huN5VRJSCFzjbuO+tjP3I8IB6WgdBmTeqq8ObtXRgahBuD -ZmkvqVSfIzK5JN4GjO8FOdCBomuwm9A92kgmAptwQwAHM9qCDJpH8L07/7poxlGb -iA== ------END CERTIFICATE----- diff --git a/assets/certificates/ssl/reseed.onion.im.crt b/assets/certificates/ssl/reseed.onion.im.crt deleted file mode 100644 index cf00a64..0000000 --- a/assets/certificates/ssl/reseed.onion.im.crt +++ /dev/null @@ -1,36 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIGNjCCBB6gAwIBAgIJAN7RN19/cj4aMA0GCSqGSIb3DQEBCwUAMIGvMQswCQYD -VQQGEwJVUzEYMBYGA1UECAwPcmVzZWVkLm9uaW9uLmltMRgwFgYDVQQHDA9yZXNl -ZWQub25pb24uaW0xGDAWBgNVBAoMD3Jlc2VlZC5vbmlvbi5pbTEYMBYGA1UECwwP -cmVzZWVkLm9uaW9uLmltMRgwFgYDVQQDDA9yZXNlZWQub25pb24uaW0xHjAcBgkq -hkiG9w0BCQEWD3Jlc2VlZC5vbmlvbi5pbTAeFw0xNjEyMjkwMDAzNDlaFw0yMTAy -MDYwMDAzNDlaMIGvMQswCQYDVQQGEwJVUzEYMBYGA1UECAwPcmVzZWVkLm9uaW9u -LmltMRgwFgYDVQQHDA9yZXNlZWQub25pb24uaW0xGDAWBgNVBAoMD3Jlc2VlZC5v -bmlvbi5pbTEYMBYGA1UECwwPcmVzZWVkLm9uaW9uLmltMRgwFgYDVQQDDA9yZXNl -ZWQub25pb24uaW0xHjAcBgkqhkiG9w0BCQEWD3Jlc2VlZC5vbmlvbi5pbTCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPQLxKdxu3Jwzirk49WRh2bAL54w -Y9twCiIYSF9Hp5SGt/BHe4USlG1gRwhiBRUGveVeJuDripw2LOhsPncqovLhGaj/ -Kz1RSLMjGkNp1hOe6WC4RCT3FfMtTsiSXqcAEItQ64Yq3bHDa3mwYYbid86YZJsI -rcE3yxv8Ycy+cnGN0ylcexdn82c7xjgoSu5cIfhl/2wZZi39g2/WnQxVkYNmKYlZ -4S94N4bkifXYBhpfSlNP303WtkVngBHuq0lK/UAOjMsiJnENQGggKOW62PxnZ7fN -kce9+ZyhI1kFje6dT8JPAxf6GVZOsx1Sn8dtn1+n0SUpWZZEvKetyMhHHdHKiRKP -egMotOZr/FCq904Ro2TaJKV372SVwuBRmvZ4a4pJMrQfyMQOGMU774V83O/ZElTG -RLvKyR4Wxdw3+6sg9gZGjtRgOFmWMemo9wCk9UhBYlz5junHD44BZQv8n1mH/zRd -aTDNajpLZ9yUCMJCW2GWPndmRMXI5esU5tp/k3Im1BrJjoLzcvTYSU3eSSwziI6w -8+buIa5YVTMXpOixEHpCwbTJOssOSl90V6usYzQv4nIycYyo/H2OE2f/9SbhM2ob -gfn5ppSncIqcQmAAp5f1TKKRyqiVVueawUH97epS1JXxbq6UbpegnOp26r88arO1 -WU9z9GzVCjBbK1O7AgMBAAGjUzBRMB0GA1UdDgQWBBQMYvu2uODNho3Av4TG6fk+ -v2c4IDAfBgNVHSMEGDAWgBQMYvu2uODNho3Av4TG6fk+v2c4IDAPBgNVHRMBAf8E -BTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAyWzML2n2cNsunUfSsnf/z8P3t3hVR -VTv4U2cEilxPIvVyHCqWLXjaDiWRwtu690QRw9wY1KNdZOJ62v3vgpazqmbAq4nf -HGkkeZhkdo4da/pDsbInnYIylCKzS3U5e4CkaojGCAkgQNKHoaXtoxgmuxvnXZ56 -vyAqtBds8AgZZ6mMQMSarO2PQWBAAiJT2L1+XYIS38Q7W5gmka77K84zhLIW8+YI -fC1vC/chiURSdQIbEeHEXlEvEPR0+YoJEpDeFuTqLY6m8HsQrFGReLpT3Fks4TJ0 -BrteHdx0QHTtRJHLjgyK0Lruq5EAUuTikQ5ThebsPAsIkmlpL7kiwUNMW2CnCV1J -5pmu9xifhHivYv+TAHgDICo9xSSUISDqtV2BOIih6I7MLuG3ElHyP9b6CFX6rNQ4 -GCrBGrKgm/KnRIeZokoWDWqJxrkKqMniZ3/DMl/T0ZGxtarKboCe9wadzURftGcV -UDghOIm/O0idjlaF9bBpNiqBcgTX/BDoygnmoVdQKgwPqLft9HbdTus4RJXrRiWW -cWp+AtCVdCi9lhr0TYvmuql6IpFz5qmrZHhHkpd0miT/Y9JcnCfi7zwbagdrm62I -+OixjgsabAphL7WU+OXg3KF5zdKF5uk0UQ++Jv3JOCNVeM5TbLPFEmaE5l7siKmW -T9WfbnHgE2dbBA== ------END CERTIFICATE----- diff --git a/src/netdb/reseed.rs b/src/netdb/reseed.rs index 9398450..abb9540 100644 --- a/src/netdb/reseed.rs +++ b/src/netdb/reseed.rs @@ -17,19 +17,18 @@ type IoFuture = Box + Send>; // ((url, port), path) // certificates/reseed/ // certificates/ssl/ // notes // ---------------------------------- ------------------------ ------------------------- --------------- #[rustfmt::skip] -const DEFAULT_RESEED_HOSTS: [((&str, u16), &str); 12] = [ - (("i2p.novg.net", 443), "/"), // igor_at_novg.net.crt // CA - (("i2pseed.creativecowpat.net", 8443), "/"), // creativecowpat_at_mail.i2p.crt // i2pseed.creativecowpat.net.crt - (("itoopie.atomike.ninja", 443), "/"), // atomike_at_mail.i2p.crt // CA - (("reseed.onion.im", 443), "/"), // lazygravy_at_mail.i2p // reseed.onion.im.crt +const DEFAULT_RESEED_HOSTS: [((&str, u16), &str); 11] = [ + (("reseed-pl.i2pd.xyz", 443), "/"), // r4sas-reseed_at_mail.i2p.crt // CA + (("reseed-fr.i2pd.xyz", 443), "/"), // r4sas-reseed_at_mail.i2p.crt // CA + (("www2.mk16.de", 443), "/"), // i2p-reseed_at_mk16.de.crt // CA + (("reseed2.i2p.net", 443), "/"), // echelon3_at_mail.i2p.crt // CA + (("banana.incognet.io", 443), "/"), // rambler_at_mail.i2p.crt // CA + (("reseed.diva.exchange", 443), "/"), // reseed_at_diva.exchange.crt // CA + (("reseed.i2pgit.org", 443), "/"), // hankhill19580_at_gmail.com.crt // CA + (("i2p.novg.net", 443), "/"), // igor_at_novg.net.crt // CA // Java 8+ only + (("i2pseed.creativecowpat.net", 8443), "/"), // creativecowpat_at_mail.i2p.crt // i2pseed.creativecowpat.net.crt // Java 7+ + (("reseed.onion.im", 443), "/"), // lazygravy_at_mail.i2p // CA // Java 8+ only (("reseed.memcpy.io", 443), "/"), // hottuna_at_mail.i2p.crt // CA // SNI required - (("reseed.atomike.ninja", 443), "/"), // atomike_at_mail.i2p.crt // CA // SNI required - (("i2p.manas.ca", 8443), "/"), // zmx_at_mail.i2p.crt // CA // SNI required - (("i2p-0.manas.ca", 8443), "/"), // zmx_at_mail.i2p.crt // CA // SNI required - (("i2p.mooo.com", 443), "/netDb/"), // bugme_at_mail.i2p.crt // i2p.mooo.com.crt - (("download.xxlspeed.com", 443), "/"), // backup_at_mail.i2p.crt // CA - (("netdb.i2p2.no", 443), "/"), // meeh_at_mail.i2p.crt // CA // SNI required - (("reseed.i2p-projekt.de", 443), "/"), // echelon_at_mail.i2p.crt // echelon.reseed2017.crt ]; macro_rules! reseed_cert { @@ -54,31 +53,30 @@ macro_rules! reseed_4096 { lazy_static! { pub(crate) static ref RESEED_SIGNERS: HashMap<&'static str, OfflineSigningPublicKey> = { let mut m = HashMap::new(); - reseed_4096!(m, "atomike@mail.i2p", "atomike_at_mail.i2p.der"); - reseed_4096!(m, "backup@mail.i2p", "backup_at_mail.i2p.der"); - reseed_4096!(m, "bugme@mail.i2p", "bugme_at_mail.i2p.der"); reseed_4096!( m, "creativecowpat@mail.i2p", "creativecowpat_at_mail.i2p.der" ); - reseed_4096!(m, "echelon@mail.i2p", "echelon_at_mail.i2p.der"); + reseed_4096!(m, "echelon@mail.i2p", "echelon3_at_mail.i2p.der"); + reseed_4096!( + m, + "hankhill19580@gmail.com", + "hankhill19580_at_gmail.com.der" + ); reseed_4096!(m, "hottuna@mail.i2p", "hottuna_at_mail.i2p.der"); + reseed_4096!(m, "i2p-reseed@mk16.de", "i2p-reseed_at_mk16.de.der"); reseed_4096!(m, "igor@novg.net", "igor_at_novg.net.der"); reseed_4096!(m, "lazygravy@mail.i2p", "lazygravy_at_mail.i2p.der"); - reseed_4096!(m, "meeh@mail.i2p", "meeh_at_mail.i2p.der"); - reseed_4096!(m, "zmx@mail.i2p", "zmx_at_mail.i2p.der"); + reseed_4096!(m, "r4sas-reseed@mail.i2p", "r4sas-reseed_at_mail.i2p.der"); + reseed_4096!(m, "rambler@mail.i2p", "rambler_at_mail.i2p.der"); + reseed_4096!(m, "reseed@diva.exchange", "reseed_at_diva.exchange.der"); m }; } const SSL_CERT_CREATIVECOWPAT_NET: &[u8] = include_bytes!("../../assets/certificates/ssl/i2pseed.creativecowpat.net.crt"); -const SSL_CERT_ONION_IM: &[u8] = - include_bytes!("../../assets/certificates/ssl/reseed.onion.im.crt"); -const SSL_CERT_MOOO_COM: &[u8] = include_bytes!("../../assets/certificates/ssl/i2p.mooo.com.crt"); -const SSL_CERT_ECHELON: &[u8] = - include_bytes!("../../assets/certificates/ssl/echelon.reseed2017.crt"); const MIN_RI_WANTED: usize = 100; const MIN_RESEED_SERVERS: usize = 2; @@ -187,9 +185,6 @@ impl HttpsReseeder { // Build TLS context with the necessary self-signed certificates let mut cx = TlsConnector::builder(); cx.add_root_certificate(Certificate::from_pem(SSL_CERT_CREATIVECOWPAT_NET).unwrap()); - cx.add_root_certificate(Certificate::from_pem(SSL_CERT_ONION_IM).unwrap()); - cx.add_root_certificate(Certificate::from_pem(SSL_CERT_MOOO_COM).unwrap()); - cx.add_root_certificate(Certificate::from_pem(SSL_CERT_ECHELON).unwrap()); let cx = cx.build().unwrap(); let mut hosts: Vec<_> = DEFAULT_RESEED_HOSTS.to_vec(); From d29b4cab6a44afbc283514192f1a7b34d3823c13 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 31 Jan 2023 14:40:35 +0000 Subject: [PATCH 2/2] Send netID to reseeds --- src/netdb/reseed.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/netdb/reseed.rs b/src/netdb/reseed.rs index abb9540..08444ca 100644 --- a/src/netdb/reseed.rs +++ b/src/netdb/reseed.rs @@ -8,6 +8,7 @@ use tokio::{io, net::tcp::TcpStream, timer::Timeout}; use super::client::{Client, StoreRouterInfo}; use crate::crypto::{OfflineSigningPublicKey, SigType}; +use crate::data::NET_ID; use crate::file::{Error as FileError, Su3Content, Su3File}; type IoFuture = Box + Send>; @@ -116,12 +117,12 @@ fn reseed_from_host( socket, format!( "\ - GET {}i2pseeds.su3 HTTP/1.0\r\n\ + GET {}i2pseeds.su3?netid={} HTTP/1.0\r\n\ Host: {}\r\n\ User-Agent: Wget/1.11.4\r\n\ \r\n\ ", - path, host.0 + path, NET_ID.0, host.0 ), ) })