From d5234059bbd10dae42493e4d06f2cad54735adb1 Mon Sep 17 00:00:00 2001
From: anonimal <anonimal@i2pmail.org>
Date: Wed, 17 Feb 2016 11:42:17 +0000
Subject: [PATCH] Reseed: add zmx's SU3/TLS cert, update reseed list

* As notified by backup@mail.i2p (0xEBBDF1C7) who is
  I2P's official reseed-list maintainer
---
 pkg/resources/certificates/ssl/2d6f4427.0     | 34 +++++++++++++++++++
 .../certificates/ssl/i2p-0.manas.ca.crt       |  1 +
 .../certificates/su3/zmx_at_mail.i2p.crt      | 34 +++++++++++++++++++
 src/core/Reseed.cpp                           |  7 ++--
 4 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 pkg/resources/certificates/ssl/2d6f4427.0
 create mode 120000 pkg/resources/certificates/ssl/i2p-0.manas.ca.crt
 create mode 100644 pkg/resources/certificates/su3/zmx_at_mail.i2p.crt

diff --git a/pkg/resources/certificates/ssl/2d6f4427.0 b/pkg/resources/certificates/ssl/2d6f4427.0
new file mode 100644
index 00000000..1afd850a
--- /dev/null
+++ b/pkg/resources/certificates/ssl/2d6f4427.0
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF8DCCBNigAwIBAgIQL3r5jK11EMAAUItXL2TpbTANBgkqhkiG9w0BAQsFADBf
+MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
+DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
+HhcNMTUxMDE0MDAwMDAwWhcNMTYwMzAzMjM1OTU5WjBeMSEwHwYDVQQLExhEb21h
+aW4gQ29udHJvbCBWYWxpZGF0ZWQxJDAiBgNVBAsTG0dhbmRpIFN0YW5kYXJkIFdp
+bGRjYXJkIFNTTDETMBEGA1UEAwwKKi5tYW5hcy5jYTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAN2+JQH6wxLq63Cq0GAB3FxSn/mZ76PENwqHwYgMMnsK
++Dvc9I7bqzWHwyjed51djrrr/nFAHL8mf4N0emG1P+v901h8IhjbbMKqLNevopEo
+jG2VaVZkKmzXFH8oKe2iP50ZGuOOMzWo4J0v4w687kcZMLHNA2X89AloOlZ57HXi
+9rM5yuWqYzBCRZJctPPMSAbKTI+XaneepC308rVxPGB+arupcaFRuuBRzpiEq8RW
+BNWLlFdSn0LLSKFh7M0I18+/mt6YVT2/8UOl0aeCtkhD2SuNk7V8AM+++iTrY1a3
+OzxO3Uoux3rIe7zUD8XgABlZ+4/fWNAXnKPbYyUwkwqjJ9EDTIDV0fa7sYEFJfFB
+OQR7NtsM3P/F79/rr/vtyJgqwSaj2VcLD1irxHKXCGMjq5V9wDXF9sLl26b6YmWw
+rirqf6trWrhHsNgPrCnYOGxmLj3VoZEqyDlI7KWnKo68QPsiICHLcKb/hPd/9gHw
+mpgbJ0LdDwJm6MHaSakXM0AIQqrlRV5wSc1S/Sc/vFPQNm/IZUEgt0FHoOkkhOHq
+drrCXb6LXJIDQLvLN9t79LRzW+QwTGsifOcO2fX8uMWprvURs+VqiyO73aNSSnwJ
+ssxukGD0eo11VD9P3okbq+1gH6qmliQVUgoXgaHdl4NJx5X+Ps5B4BuF8cqB/jfN
+AgMBAAGjggGnMIIBozAfBgNVHSMEGDAWgBSzkKfYya9OzWE8n3ytXX9B/Wkw6jAd
+BgNVHQ4EFgQUzttIF4pVLtpJm/pXRQ8UrZsy5QkwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEsGA1Ud
+IAREMEIwNgYLKwYBBAGyMQECAhowJzAlBggrBgEFBQcCARYZaHR0cHM6Ly9jcHMu
+dXNlcnRydXN0LmNvbTAIBgZngQwBAgEwQQYDVR0fBDowODA2oDSgMoYwaHR0cDov
+L2NybC51c2VydHJ1c3QuY29tL0dhbmRpU3RhbmRhcmRTU0xDQTIuY3JsMHMGCCsG
+AQUFBwEBBGcwZTA8BggrBgEFBQcwAoYwaHR0cDovL2NydC51c2VydHJ1c3QuY29t
+L0dhbmRpU3RhbmRhcmRTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
+cC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCCioubWFuYXMuY2GCCG1hbmFzLmNh
+MA0GCSqGSIb3DQEBCwUAA4IBAQBINg6HdHnlbGPHgfZ3NGD4EDUCcRYK9FAbrdQU
+EuL3UBel+2yanMSjF+ILJ16Vceq1RuJa7nqAYw1bn5iqkzMFtCgmfDEPxfpQ6Y6I
+oejjJlRqi6V2Yyn0Vrc6AW6KIYa/gVn9zpmxmAiKlnYzB/p6SVT+xmAE2yg1MBvo
+iYfn4xMbc5LcxzEqzVaS6TYKBY/bdXII7rdvJ6Pirkp/s7RX7q2NnWtI1ldlnmWt
+gX40mWq2Q7uTR+hx2cdASQPPd2Pv5EoUouMTSB/C0JcO4YMS0QhWzowa4JmjFwF2
+Jp5HsajyVkNU70fhB1WUZas15X/9WgNREh/Qk9/8D4im2T4U
+-----END CERTIFICATE-----
diff --git a/pkg/resources/certificates/ssl/i2p-0.manas.ca.crt b/pkg/resources/certificates/ssl/i2p-0.manas.ca.crt
new file mode 120000
index 00000000..64cb714b
--- /dev/null
+++ b/pkg/resources/certificates/ssl/i2p-0.manas.ca.crt
@@ -0,0 +1 @@
+2d6f4427.0
\ No newline at end of file
diff --git a/pkg/resources/certificates/su3/zmx_at_mail.i2p.crt b/pkg/resources/certificates/su3/zmx_at_mail.i2p.crt
new file mode 100644
index 00000000..41f4cc75
--- /dev/null
+++ b/pkg/resources/certificates/su3/zmx_at_mail.i2p.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+fNr8P7NIRyZ8
+-----END CERTIFICATE-----
diff --git a/src/core/Reseed.cpp b/src/core/Reseed.cpp
index 7f25daea..8e53b916 100644
--- a/src/core/Reseed.cpp
+++ b/src/core/Reseed.cpp
@@ -64,15 +64,16 @@ namespace i2p {
 namespace data {
 
 static std::vector<std::string> reseedHosts = {
-  //"https://download.xxlspeed.com/",  // Requires SNI
-  //"https://i2pseed.zarrenspry.info/", // Host not found (authoritative)
   "https://i2p.mooo.com/netDb/",
-  //"https://netdb.i2p2.no/",  // Requires SNI
   "https://reseed.i2p-projekt.de/",
   "https://reseed.i2p.vzaws.com:8443/",
   "https://uk.reseed.i2p2.no:444/",
   "https://us.reseed.i2p2.no:444/",
   "https://user.mx24.eu/",
+  //"https://download.xxlspeed.com/",  // Requires SNI
+  //"https://i2p-0.manas.ca:8443/",  // Requires SNI
+  //"https://i2pseed.zarrenspry.info/", // Host not found (authoritative)
+  //"https://netdb.i2p2.no/",  // Requires SNI
 };
 
 Reseeder::Reseeder() {}