echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove atomike reseed and cert

Browse Source 
Add backup plugin cert
Add log for one case where no valid RIs found in reseed
This commit is contained in:
zzz
2019-06-18 17:35:14 +00:00
parent ebe95fc575
commit 51457bd873
4 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
installer/resources/certificates/plugin/backup_at_mail.i2p.crt Normal file
View File

@ -0,0 +1,33 @@
-----BEGIN CERTIFICATE-----
MIIFnTCCA4WgAwIBAgIJTngNC7YLAYpnMA0GCSqGSIb3DQEBDQUAMFYxHjAcBgNV
BAcTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEMMAoGA1UEChMDSTJQMQwwCgYDVQQL
EwNJMlAxGDAWBgNVBAMMD2JhY2t1cEBtYWlsLmkycDAeFw0xOTA2MTEwOTE0NTJa
Fw0yOTA2MTEwOTE0NTJaMFYxHjAcBgNVBAcTFUkyUCBBbm9ueW1vdXMgTmV0d29y
azEMMAoGA1UEChMDSTJQMQwwCgYDVQQLEwNJMlAxGDAWBgNVBAMMD2JhY2t1cEBt
YWlsLmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGlYRD27TJX
1O2Zmf6jirLwArs1Zz4fLiiGUcGO+q47KINc/xfAngRRvzVxbwbuJhSP7aP6Wzyy
FQdmngLKHpceA3cYNILoPEd5jWTcjOtveBN2sJnggIo/mm21rYxJI3nwIx5vvSGj
YHBOhkF21d7UY5BVGPSZ+QPaRKmHVR9O/6dwXXm87BgYhTmFSqXXjQhzPok0Svl1
AbLcN6Y9ThCmvcql2o3W9iDxvI9rpTZaTLmvE3VS06ezgXP7fBYPu1lCEZHsYH6f
HtY2T1Gh2gFS6kZJvOwk8XWdQ9pLF7+eIGl9X7BH5V8pD1SSfy9LvYRboZUMGtb1
DwjSHOZjk8VoTsT5tiwN/uvIdkQ+tz81r346uCw8D56RTO9AE5p6j7ThxtKRcnGQ
e2NvBB/q9Qo8DL2CPBUCqYF3i8o44NOsYklRk3657n+VB45rPQHGfCMNL0Q89vpA
IEWso4duLY5EKcLG14ZOA12Xi+iy/v6qzc1fOZeuTvycj2EYXqadS840G5WPEzqx
SLg0AlAYGtfJWKvoYQshM10J30iF5gkR4/2qb8vaSgk5KD0wkA6tJ+1LTxdznisK
Zmx/xLCLKU/AGD9f1F+LoZXTuhqa00NncF+XigNpvBPvEZ+k7/vHzBOBU8KcJ+TR
hToy1jqFdh0mwendDvJxJYlU1zXBzFlVAgMBAAGjbjBsMB0GA1UdDgQWBBQQpUe7
AnP4KJNN3IrRfq2JigVifjAfBgNVHSMEGDAWgBQQpUe7AnP4KJNN3IrRfq2JigVi
fjAOBgNVHQ8BAf8EBAMCAaYwGgYDVR0RBBMwEYEPYmFja3VwQG1haWwuaTJwMA0G
CSqGSIb3DQEBDQUAA4ICAQAWCMW/OokXeMYQpvG8SNikkzboqRoaRMT+W73/jgAq
EMmT7A43Gv/qKZ7iuxhxhPVAYRvLQZy9NTdGxXe/lUTItMipMPaSm1/0wla4+dtG
q4nSS9DPTQNStcoVa1ljZp/jufKUCDx8a+vSg/p0aKzkeXwS0XvzB1Uc9WbGr51y
i1NwfgsvbltYC2g8sGVgwiwbCogYmbMZF5d//CUQf0LLbFqroeFlCpmAG30E75tB
YVjpr0RNn+OBSjn95IIr5urTSxCWJcmIl7GSLyf7becUSz9EpP2WC8mXiheMPU7D
unofiIt21V5mRXBOuF1B2KISYXfn5mYZAj/KEnUhMzC3YNv8GA7IoG4I/KCl9V06
fhW5UvaOCl1QSZMSCFYbE5OXYGOTbVF66K8kwGHGSIuFEgh6IXf4MLp1xILUgK9l
UmT1NJSkSt1FCOI0kP+CfmCINUiQ5elFxOPNTjCEhLZHNhHGa1p33l4ggG/CZQUW
41rUtxyrN7dY+g+AopHePMLvtGFWKlm4O5bKwD3f4UtBFme/dycWlwp6TQrzI6Mo
BRgGeKJzpRs1YXWT+ZaOHLJvFUNaPlImEfUWa3egJo2mnuhAg1N3DPWk4yda+TOH
/sjrPREOVGQ5wl4NKgYApB/dwnzgKSsecLzHheB+ekks1OC3wGxrdPnAQhIofc+G
wg==
-----END CERTIFICATE-----

34
installer/resources/certificates/reseed/atomike_at_mail.i2p.crt
View File

@ -1,34 +0,0 @@
-----BEGIN CERTIFICATE-----
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
cGpnw4a2u9sHZIUNHzoGq32+7UWXsBI5Ow==
-----END CERTIFICATE-----

1
installer/resources/deletelist.txt
View File

@ -112,3 +112,4 @@ certificates/ssl/netdb.i2p2.no.crt
# vanished
certificates/news/killyourtv_at_mail.i2p.crt
certificates/router/killyourtv_at_mail.i2p.crt
certificates/reseed/atomike_at_mail.i2p.crt

7
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@ -112,7 +112,7 @@ public class Reseeder {
"https://reseed.i2p.net.in/" + ',' + // reseedi2pnetin_at_mail.i2p.crt // CA // Java 8+ only, TLS 1.2 only
"https://i2p.novg.net/" + ',' + // igor_at_novg.net.crt // CA // Java 8+ only
"https://i2pseed.creativecowpat.net:8443/" + ',' + // creativecowpat_at_mail.i2p.crt // i2pseed.creativecowpat.net.crt // Java 7+
"https://itoopie.atomike.ninja/" + ',' + // atomike_at_mail.i2p.crt // CA // Java 8+ only
//"https://itoopie.atomike.ninja/" + ',' + // atomike_at_mail.i2p.crt // CA // Java 8+ only
"https://reseed.onion.im/" + ',' + // lazygravy_at_mail.i2p // reseed.onion.im.crt // Java 8+ only
"https://reseed.memcpy.io/" + ',' + // hottuna_at_mail.i2p.crt // CA // SNI required
//"https://reseed.atomike.ninja/" + ',' + // atomike_at_mail.i2p.crt // CA // SNI required, Java 8+ only
@ -798,6 +798,11 @@ public class Reseeder {
stats = extractZip(contentRaw);
fetched = stats[0];
errors = stats[1];
if (fetched == 0) {
s = "Reseed got no router infos " + s;
System.err.println(s);
_log.error(s);
}
} catch (Throwable t) {
String s = getDisplayString(seedURL);
System.err.println("Error reseeding " + s + ": " + t);