From c18dbe974a4abf1e3e88a3062d671d7d06b777fa Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 2 Nov 2020 22:19:49 +0000
Subject: [PATCH] Remove reseed SSL cert, now using a CA
---
.../certificates/ssl/reseed.onion.im.crt | 32 -------------------
installer/resources/deletelist.txt | 1 +
.../i2p/router/networkdb/reseed/Reseeder.java | 2 +-
3 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100644 installer/resources/certificates/ssl/reseed.onion.im.crt
diff --git a/installer/resources/certificates/ssl/reseed.onion.im.crt b/installer/resources/certificates/ssl/reseed.onion.im.crt
deleted file mode 100644
index 14d4227f04..0000000000
--- a/installer/resources/certificates/ssl/reseed.onion.im.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFlTCCA32gAwIBAgIUOnnfps6JP2FEMpQ01xoWOIPUYcowDQYJKoZIhvcNAQEL
-BQAwWjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5KMRgwFgYDVQQDDA9yZXNlZWQu
-b25pb24uaW0xJDAiBgkqhkiG9w0BCQEWFWNocmlzK3Jlc2VlZEBiYXJyeS5pbTAe
-Fw0yMDEwMjAyMjE4MDVaFw0yNTEwMjAyMjE4MDVaMFoxCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIDAJOSjEYMBYGA1UEAwwPcmVzZWVkLm9uaW9uLmltMSQwIgYJKoZIhvcN
-AQkBFhVjaHJpcytyZXNlZWRAYmFycnkuaW0wggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQD0C8SncbtycM4q5OPVkYdmwC+eMGPbcAoiGEhfR6eUhrfwR3uF
-EpRtYEcIYgUVBr3lXibg64qcNizobD53KqLy4Rmo/ys9UUizIxpDadYTnulguEQk
-9xXzLU7Ikl6nABCLUOuGKt2xw2t5sGGG4nfOmGSbCK3BN8sb/GHMvnJxjdMpXHsX
-Z/NnO8Y4KEruXCH4Zf9sGWYt/YNv1p0MVZGDZimJWeEveDeG5In12AYaX0pTT99N
-1rZFZ4AR7qtJSv1ADozLIiZxDUBoICjlutj8Z2e3zZHHvfmcoSNZBY3unU/CTwMX
-+hlWTrMdUp/HbZ9fp9ElKVmWRLynrcjIRx3RyokSj3oDKLTma/xQqvdOEaNk2iSl
-d+9klcLgUZr2eGuKSTK0H8jEDhjFO++FfNzv2RJUxkS7yskeFsXcN/urIPYGRo7U
-YDhZljHpqPcApPVIQWJc+Y7pxw+OAWUL/J9Zh/80XWkwzWo6S2fclAjCQlthlj53
-ZkTFyOXrFObaf5NyJtQayY6C83L02ElN3kksM4iOsPPm7iGuWFUzF6TosRB6QsG0
-yTrLDkpfdFerrGM0L+JyMnGMqPx9jhNn//Um4TNqG4H5+aaUp3CKnEJgAKeX9Uyi
-kcqolVbnmsFB/e3qUtSV8W6ulG6XoJzqduq/PGqztVlPc/Rs1QowWytTuwIDAQAB
-o1MwUTAdBgNVHQ4EFgQUDGL7trjgzYaNwL+Exun5Pr9nOCAwHwYDVR0jBBgwFoAU
-DGL7trjgzYaNwL+Exun5Pr9nOCAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAgEA8xEe5B/O5OHIAYHBjut4wbUk6xY157D2j0Om49kZ1bwJIkHFRgcb
-K5q+ivNXILxJqVdL8zQ9fi4wjC5C5bVQlOZwTYaXPdfvi1qpZ6y5JYwSYO1mAc0k
-qvqb8967Lc1VrGuEba1KhnzJNjEYcJVVKD/oAgKlO81okeRhJz/qeR6k/wXCAfnX
-aXl2NdulFN70ItKWH8zp90Wxp6fGTD3PfqRdhKqlBDUlM6ZyjTguz25X505ygM0f
-HTBtwZf+Tjp7Sgt5vohfTVtTHYjL0KOpl1ggjbVQ6yLBgegc02Zpa+sEckm9LEs7
-4V3hcIIkycW6Gou5DjuVaiLtbIiYQxJ4NITRfFopsXCMFxT3+H58YwP3KfYzSn19
-OK4OdrdGJ35I3DxO9e/hopyRrJzvIHmVNriDv5D+GVZn9iCHQHBLYTnhNhTeY/us
-dPQBMeuMeVPmQQ7Dpeaju7avgOPk3/ZIvKfwjlzT7Cs5RY2YeIOdB2XIIg8jHZRJ
-Tqz2PN4PYHmKn57XDg9lqfnJeqPWWdEr7OhJGf1+JVh0XHMX/fMOW9kdVJYTimnn
-YVbbBQVwB5AA0u4snb8LvErjU0zYVCMSwhdHzLenR+lgBaZXUgkfct/8YDU+H3GJ
-OgtFhWR+2pUZsqUZKNfWrUnp4rB7g/nZzSslh3ZybGcdpIENFr9F9AQ=
------END CERTIFICATE-----
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index b8ac640934..758dc1f6de 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -109,6 +109,7 @@ certificates/ssl/reseed.i2p.vzaws.com.crt
certificates/reseed/parg_at_mail.i2p.crt
certificates/ssl/reseed.i2p.vzaws.com2017.crt
certificates/ssl/netdb.i2p2.no.crt
+certificates/ssl/reseed.onion.im.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 61d71ec6f3..dc71ed8e38 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -115,7 +115,7 @@ public class Reseeder {
"https://reseed.i2pgit.org/" + ',' + // hankhill19580_at_gmail.com.crt // CA
"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://reseed.onion.im/" + ',' + // lazygravy_at_mail.i2p // reseed.onion.im.crt // Java 8+ only
+ "https://reseed.onion.im/" + ',' + // lazygravy_at_mail.i2p // CA // Java 8+ only
"https://reseed.memcpy.io/" + ',' + // hottuna_at_mail.i2p.crt // CA // SNI required
//"https://netdb.i2p2.no/" + ',' + // meeh_at_mail.i2p.crt // CA // SNI required
"https://reseed.i2p2.no/" + ',' + // meeh_at_mail.i2p.crt // CA // SNI required
--
GitLab