From 25c709afe29ef87b0be558a5a1dd3347c27685b2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 11 Jun 2017 16:30:12 +0000 Subject: [PATCH] Reseed updates --- .../reseed/creativecowpat_at_mail.i2p.crt | 35 +++++++++++++++++++ .../certificates/reseed/parg_at_mail.i2p.crt | 34 ------------------ .../ssl/i2pseed.creativecowpat.net.crt | 16 +++++++++ .../ssl/reseed.i2p.vzaws.com2017.crt | 33 ----------------- installer/resources/deletelist.txt | 2 ++ .../i2p/router/networkdb/reseed/Reseeder.java | 3 +- 6 files changed, 54 insertions(+), 69 deletions(-) create mode 100644 installer/resources/certificates/reseed/creativecowpat_at_mail.i2p.crt delete mode 100644 installer/resources/certificates/reseed/parg_at_mail.i2p.crt create mode 100644 installer/resources/certificates/ssl/i2pseed.creativecowpat.net.crt delete mode 100644 installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt diff --git a/installer/resources/certificates/reseed/creativecowpat_at_mail.i2p.crt b/installer/resources/certificates/reseed/creativecowpat_at_mail.i2p.crt new file mode 100644 index 000000000..07fe75aa1 --- /dev/null +++ b/installer/resources/certificates/reseed/creativecowpat_at_mail.i2p.crt @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +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 +Hz8KWVkHZg== +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/reseed/parg_at_mail.i2p.crt b/installer/resources/certificates/reseed/parg_at_mail.i2p.crt deleted file mode 100644 index e78b264c2..000000000 --- a/installer/resources/certificates/reseed/parg_at_mail.i2p.crt +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -N1tGWBZt9Prq ------END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/i2pseed.creativecowpat.net.crt b/installer/resources/certificates/ssl/i2pseed.creativecowpat.net.crt new file mode 100644 index 000000000..26d6b73da --- /dev/null +++ b/installer/resources/certificates/ssl/i2pseed.creativecowpat.net.crt @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICkDCCAhWgAwIBAgIRAMhQCy2Tr8yJROCbIMWY1ucwCgYIKoZIzj0EAwQwejEL +MAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwGA1UEChMV +STJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxIzAhBgNVBAMTGmky +cHNlZWQuY3JlYXRpdmVjb3dwYXQubmV0MB4XDTE3MDUyNjE5NDQzMFoXDTIyMDUy +NTE5NDQzMFowejELMAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJY +WDEeMBwGA1UEChMVSTJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAx +IzAhBgNVBAMTGmkycHNlZWQuY3JlYXRpdmVjb3dwYXQubmV0MHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAEK2UzxGNMwqY4DUSE8O1wqyBGi8x2eZ/OX0+RFz3BUZ2RQUsB +Lwni0DZ4SvQZdxJHbbikRyM/QpcLPBdQZOcOSI6L3qxguyfzgb+EnyOcTZh/xg8S +4R1ltrCqBribBYKRo18wXTAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYB +BQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAlBgNVHREEHjAcghppMnBzZWVkLmNyZWF0 +aXZlY293cGF0Lm5ldDAKBggqhkjOPQQDBANpADBmAjEAmgPDIN5HLpz3dJ8/QnUr +rd8KSBRzneZDnQA2qcptlp+wjpm1rtpb2bG2SKwk0LKXAjEAkdHzbkw0C0hoawIU +UX7CUhwIXQDhNe09fF4G0sHBS6xcCVWjfz3y7ktQ1+B+7vJL +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt b/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt deleted file mode 100644 index 336b7bb53..000000000 --- a/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -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 ------END CERTIFICATE----- diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt index ff11c75f8..9c6b6dc8a 100644 --- a/installer/resources/deletelist.txt +++ b/installer/resources/deletelist.txt @@ -106,6 +106,8 @@ certificates/ssl/download.xxlspeed.com.crt certificates/ssl/uk.reseed.i2p2.no.crt certificates/ssl/us.reseed.i2p2.no.crt certificates/ssl/reseed.i2p.vzaws.com.crt +certificates/reseed/parg_at_mail.i2p.crt +certificates/ssl/reseed.i2p.vzaws.com2017.crt # vanished certificates/news/killyourtv_at_mail.i2p.crt certificates/router/killyourtv_at_mail.i2p.crt 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 b4f07b82a..13188b340 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -108,14 +108,13 @@ public class Reseeder { // // https url:port, ending with "/" // certificates/reseed/ // certificates/ssl/ // notes // ---------------------------------- ------------------------ ------------------------- --------------- - //"https://randomrng.ddns.net/" + ',' + // randomrng_at_mail.i2p.crt // CA // Java 7+ + "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://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 "https://i2p.manas.ca:8443/" + ',' + // zmx_at_mail.i2p.crt // CA // SNI required "https://i2p-0.manas.ca:8443/" + ',' + // zmx_at_mail.i2p.crt // CA // SNI required - "https://reseed.i2p.vzaws.com:8443/" + ',' + // parg_at_mail.i2p.crt // reseed.i2p.vzaws.com.crt "https://i2p.mooo.com/netDb/" + ',' + // bugme_at_mail.i2p.crt // i2p.mooo.com.crt "https://download.xxlspeed.com/" + ',' + // backup_at_mail.i2p.crt // CA // Java 8+ "https://netdb.i2p2.no/" + ',' + // meeh_at_mail.i2p.crt // netdb.i2p2.no.crt // SNI required