diff --git a/installer/resources/certificates/ssl/jp.reseed.i2p2.no.crt b/installer/resources/certificates/ssl/jp.reseed.i2p2.no.crt new file mode 100644 index 0000000000000000000000000000000000000000..1cb5abec5038ab9cc5185c93c817088359c47f5d --- /dev/null +++ b/installer/resources/certificates/ssl/jp.reseed.i2p2.no.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFqTCCA5GgAwIBAgIJAPsJOCng4aEOMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV +BAYTAk5PMQ0wCwYDVQQIDARPc2xvMQ4wDAYDVQQHDAVKYXBhbjEMMAoGA1UECgwD +STJQMRMwEQYDVQQLDApJMlAgUmVzZWVkMRowGAYDVQQDDBFqcC5yZXNlZWQuaTJw +Mi5ubzAeFw0xNDA2MjgyMDQ3MThaFw0yNDA2MjUyMDQ3MThaMGsxCzAJBgNVBAYT +Ak5PMQ0wCwYDVQQIDARPc2xvMQ4wDAYDVQQHDAVKYXBhbjEMMAoGA1UECgwDSTJQ +MRMwEQYDVQQLDApJMlAgUmVzZWVkMRowGAYDVQQDDBFqcC5yZXNlZWQuaTJwMi5u +bzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALlZBIbb4MHqLPpUy298 +PG5z7RFo4bO7CxW2LO8DgE93KNbdkZuYpt6KcAW/gkDfKCiXTxDjyqmzZeBeIbcS +ea96jFc/pTknkiiSm9NX4ATcyRwvKXn6DR/iOiofP3G/sEkxgIdv3BgEYsF5jPQY +KefG0Jvl612cIX+1jC3lRRePYPUZnWxIuokXglLApeyhNzTK/KHIsLzR+56ScltM +pwGlroTky5ekPx4ZnJCxI+qFXWcgqdoNixPUkOtceYm7u5gd1D+mQDuCB5zfB+Pw +Iy9BTARot9M3fMrcRRVfEIGWwN1+bRnZvr0A/sqYMUqGPiUVOMi/mzyqZVQ14CGy +0idRhUKdOb/HNSmcep0Jwp0cP+VD/nCNU4JLptTLdErpTJrmDn+zkuQPPSMTzTWg +Fh3ktRsJ5zKfrnrBGxeKbciZgRkVHyWpv3+0AgbD8C3HvDj4qpkIO6D2gf+TREyM +frDXN6luqkThQcUFv+huMaL3Iul2doYqw5YPAdel6/cCD12n/FoEj5UJ47O/77DA +ITYfKCFRKDh/Ew7Ih3bH66uNaUUp+a0Sd6fNXLmWWr7gcn5B5CvrXhjPPror+Xyz +EZVByPTTfU1BkMQuxv20GG65M9g9wtXrD79N8di2wOfr4EG5i6L9ZvNTThwgWGGd +9f745WCnPL/ulLT9Glnlfk01AgMBAAGjUDBOMB0GA1UdDgQWBBR5Ed38JID7+JwB +hpOLi1Xt1ORyoTAfBgNVHSMEGDAWgBR5Ed38JID7+JwBhpOLi1Xt1ORyoTAMBgNV +HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQBRT/ourx4xT0n/qHF1vy8Ii02v +Hg5lHmzmiVn/3/S4q+t4HrOF6MSjjvVzVNk6JIIYb3+hwGUO31OLNZX60JfSMW+C +ffPiaNDLm/xE4yt4B/QZZDs0kv0RMjGau6k2XJPGvxVNl6LhM6LLvzMEtOGzBr0J +Ai4ZU+WqHk3nnXYHbg7C7Iuu8CT8tBpkaeW/VEN82dcLEulHFxA5Ia6HlwqrgvIW +w77oaOhOh5LKkdS8uHx4OUP8Mv25H2cMBblUdubbeqREyOGRGTkVXfRekD8K95ol +PfT9PhnhUXKRaSwy0nRqvRMiwk/CyIJTbMMflDET1P785diSvtJP0fOhkev9Uprz +FvLsPUTvANUz+vd2KJiLuGbR/d/LaJm18vdWx13vKVO60TBnyFQDS4RZbeuNp73v +x5fPTmiiPZYZj13m2xyes7SXJqhVbms0F39soThpuYrjCaHXyFgqah27+9Ivmbhu +EefPgLmkOx3v0kSfXdJYdji/mrKxERmqT1L34U6M32tCoSbjO7lakAV2opisbHEw +EehCuI83cGp/m3z8yjMoWV8Z4VoB+qMzxzgrXc5C2lxYAT4JggAV2SGcY9MszETI +/S7y5UypV4rutyJvHFrlJZKtp2B7Xi8N8n2NG1WGppYh9UShbFhDaVIMQpjZokAg +MHk7ixe0rSbnHcNF8g== +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt b/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt index e7831438a5c98ff79c0c2a521d8374e884afb2ee..84f3f073daca88a86697a405e45a714e0d3e1df3 100644 --- a/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt +++ b/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt @@ -1,23 +1,33 @@ -----BEGIN CERTIFICATE----- -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 +o+aTNc4k/7E543FVbs40dpOD2Fcr -----END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt b/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt new file mode 100644 index 0000000000000000000000000000000000000000..eae724e96c241c71c4261cfb837de5976ace5d33 --- /dev/null +++ b/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDUDCCAjgCCQCkTcCJMdZV7zANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJO +TzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwET3NsbzES +MBAGA1UECwwJTm9yZGNsb3VkMRowGAYDVQQDDBF1cy5yZXNlZWQuaTJwMi5ubzAe +Fw0xNDA2MjcyMjQxMjFaFw0yNDA2MjQyMjQxMjFaMGoxCzAJBgNVBAYTAk5PMQ0w +CwYDVQQIDARPc2xvMQ0wCwYDVQQHDARPc2xvMQ0wCwYDVQQKDARPc2xvMRIwEAYD +VQQLDAlOb3JkY2xvdWQxGjAYBgNVBAMMEXVzLnJlc2VlZC5pMnAyLm5vMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAomVoBEc53jzy3xGMfgRaKyX6MaGG +KAmwu0uMTX6bVzGjy56JMMq3luoxOrpvgrNZF52lu7i36Tejo0HM75AHoea1es55 +DNLmrlDeqzlBU2WibOnizbB8G+tlMEbx8eAGAWk/Wv/vH8CAKmxjImslmbajzZC2 +LEH7inp3J5T2sVV7zmXeL9OEPKNyohbu6Mrno2IAlEOr8cu+lWAaFWzpknnR1gBX +NkB/8+7vK5Fq4MT7B0qnXPxmaWDbUOepPPni8u+2L9+qt19vZH4/6KNuH7xd7JLz +FfIdol6jy2cBQyAK7cVKWDHNk7ceB4Dl0mjBDbBIRTtLK+rfdnVmfWn8aQIDAQAB +MA0GCSqGSIb3DQEBBQUAA4IBAQCQH4QJMp5xneh2ah7fiuVdtKbiv6QNunRz7nb/ +mWYyqmBX7EHL8jOG5qmPELDgDt58HmnaYMo05nEJb9JhAoviEDXSYw0s6eN4n4nc +MKqgR/HLLSiXPwT+Wi1MI57OYim5AFTUCYTSaWFUT+dZKYb0QPE1XjGpQXi3ppsJ +3TJG71tOzJmZT6vRPmdTHJO70v6ZEhr5w4SiGx07gNmcgO8WRyb5ajOwSHiGKrj6 +UsuRNhtCyZaAEmelR9mfKBR1J2Nb+9jTz6mJtpT82WY3bst6mFk+A+mMWBQy7Hjt +gpdSDBCcFx9if+AKINGLgFvFKV2q8UzbfXms19NsVt9Hu7W3 +-----END CERTIFICATE----- diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index 821ab5d95a1adaa58f616c689bb3d0e836c73e84..8c100ef5f14143ad3c8198db0ef293c879535049 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -78,8 +78,9 @@ public class Reseeder { "http://netdb.i2p2.no/" + "," + "http://reseed.info/" + "," + "http://reseed.pkol.de/" + "," + - //Temp disabled (ticket #1276) - //"http://uk.reseed.i2p2.no/" + "," + + "http://us.reseed.i2p2.no/" + "," + + "http://uk.reseed.i2p2.no/" + "," + + "http://jp.reseed.i2p2.no/" + "," + "http://i2p-netdb.innovatio.no/" + "," + "http://ieb9oopo.mooo.com"; // Temp disabled since h2ik have been AWOL since 06-03-2013 @@ -97,8 +98,9 @@ public class Reseeder { "https://reseed.info/" + "," + //Temp disabled (ticket #1326) //"https://reseed.pkol.de/" + "," + - //Temp disabled (ticket #1276) - //"https://uk.reseed.i2p2.no/" + "," + + "https://us.reseed.i2p2.no:444/" + "," + + "https://uk.reseed.i2p2.no:444/" + "," + + "https://jp.reseed.i2p2.no:444/" + "," + "https://i2p-netdb.innovatio.no/" + "," + "https://ieb9oopo.mooo.com"; // Temp disabled since h2ik have been AWOL since 06-03-2013