Pluck of 48ac112fe938c8e960413ad60f64d313a1e5c9ac and e415e24aca895c5a1f88380b1a3946e3b49749a9

* Add new *.i2p2.de certificate
* Added backup's ressed server. (Thanks backup!)
* Temporary removing h2ik's server since he's been AWOL since 06-03-2013 and he's reseed server is down.


applied changes from 185bc62d33224812060d2f68266a029935fb710d
             through 48ac112fe938c8e960413ad60f64d313a1e5c9ac

applied changes from 1194eb12084302380b4315b20e5ae0c574ce1be3
             through e415e24aca895c5a1f88380b1a3946e3b49749a9
This commit is contained in:
zzz
2013-04-21 13:47:16 +00:00
parent 2430e180f3
commit eb3de929bf
3 changed files with 65 additions and 2 deletions

View File

@ -0,0 +1,30 @@
-----BEGIN CERTIFICATE-----
MIIFITCCBAmgAwIBAgIJALPc1htlOiBTMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
VQQGEwJERTEaMBgGA1UECBMRaWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAcTEWll
Yjlvb3BvLm1vb28uY29tMRowGAYDVQQKExFpZWI5b29wby5tb29vLmNvbTEaMBgG
A1UECxMRaWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAMTEWllYjlvb3BvLm1vb28u
Y29tMSAwHgYJKoZIhvcNAQkBFhFpZWI5b29wby5tb29vLmNvbTAeFw0xMjExMDQx
ODMyMzVaFw0zMjEwMzAxODMyMzVaMIG7MQswCQYDVQQGEwJERTEaMBgGA1UECBMR
aWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAcTEWllYjlvb3BvLm1vb28uY29tMRow
GAYDVQQKExFpZWI5b29wby5tb29vLmNvbTEaMBgGA1UECxMRaWViOW9vcG8ubW9v
by5jb20xGjAYBgNVBAMTEWllYjlvb3BvLm1vb28uY29tMSAwHgYJKoZIhvcNAQkB
FhFpZWI5b29wby5tb29vLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBALsBO5be1l19fiNVg0yiZYglHCi9/dodQ4nT9X8N+1+HFuFo5DRY8uprsuNd
wSCTBU6NC3MRJ/iXgGyFhNuMH3F7xWBxSUtlidpK3CloKcO4VsZzRF6i6qLtSpWk
X7nA3A6WjjirwhFFwIRfi/LruKjCvZcSu1P6xYUbmV7PF7w2CWxr8TvR/RDGaR+c
mcHv0clmzl19IRAXpjfI10k3SxNHjPpoBrk72gW522oyqMF4pAUFC2RvCgOT6voM
rxgJUpTLBWgg+KebvlMp/iXlMECMfit2bV7rEKR7g9qa2U7fyNT9XBc4vSmkNl5s
P4xiKeVXsvB6REDXN636sftwaKMCAwEAAaOCASQwggEgMB0GA1UdDgQWBBRZe7PX
oFzrR2lNdr2NVuOf+RFawDCB8AYDVR0jBIHoMIHlgBRZe7PXoFzrR2lNdr2NVuOf
+RFawKGBwaSBvjCBuzELMAkGA1UEBhMCREUxGjAYBgNVBAgTEWllYjlvb3BvLm1v
b28uY29tMRowGAYDVQQHExFpZWI5b29wby5tb29vLmNvbTEaMBgGA1UEChMRaWVi
OW9vcG8ubW9vby5jb20xGjAYBgNVBAsTEWllYjlvb3BvLm1vb28uY29tMRowGAYD
VQQDExFpZWI5b29wby5tb29vLmNvbTEgMB4GCSqGSIb3DQEJARYRaWViOW9vcG8u
bW9vby5jb22CCQCz3NYbZTogUzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
A4IBAQCWjZH6nsnY2cpS3BOapCIx8hhyV6u+ujen9yXLuQNArN6FzqAiESk0bjkH
v6hFJ/JLiVglrvZDQUJP4whnXWXNETm+/WIjkzfnKPHv+L8KkRtI65ZSMNU+ghwA
fxZmu6ENIGZbXxvwSQX3uzXTgBgKsRX6QtXjtp84pOmIP+ypmaxRp764jTSYZtm2
l4A7SZWxgVELUhOSsRqxZwfXL9DnXJ9PX5wQ8MjBQBWwk0QykT3YKZpLm/aXX4Zm
4C/NGZAanSphJXhY5jxWXSqxSAqNVzbbKNanCMpOu75KCcZ+kL+Sp5EZEnNsiQFl
PEJPqmwRc3NwLefhcsKmXCJgrHpj
-----END CERTIFICATE-----

View File

@ -0,0 +1,29 @@
-----BEGIN CERTIFICATE-----
MIIE5zCCA8+gAwIBAgIQfVFBXr4UwHJKSAhsc3ZrozANBgkqhkiG9w0BAQUFADBw
MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
VQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEWMBQGA1UE
AxMNQ09NT0RPIFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xODA0MTUyMzU5NTla
MFUxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UECxMT
Q09NT0RPIFNTTCBXaWxkY2FyZDESMBAGA1UEAxQJKi5pMnAyLmRlMIIBIjANBgkq
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87UdXGI3YviPk9mP/jbUJ02QSS9TmkyO
8i9R9Q7tcEQg7BGE/RLOCt/VXJ8o5w5RllwkQD26+aGtSLOXmUtS5vNyLXPZ6oAk
Ldiwt4p6ylwK96cOI8kk+LTKcDptWpS4oSyY5SdfW2avglhPX3eNdLy660jtGhuO
7DwZ9JPO+MeEokj9NaifxXbI50KzGeaWpqPnB8mop2bFV3jjJJAq2yI79kRCT5pn
+7cYpOCG9vIyaGYZhN78ITGGU7n+oqWdqw+M0dJqMxMn+Uyy5OpkTm+8YVZYEc93
/X3tfyU25J/1AZZMkgMggeDcn0HlUnyHqhMpI3kE+wGaDuR+lHMncwIDAQABo4IB
ljCCAZIwHwYDVR0jBBgwFoAUG2u9H4pJGJRUN1W0IBftN7l3GH0wHQYDVR0OBBYE
FEubJXM4dpbJLU/Y8W7zT07wRr6HMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
by5jb20vQ1BTMAgGBmeBDAECATA4BgNVHR8EMTAvMC2gK6AphidodHRwOi8vY3Js
LmNvbW9kb2NhLmNvbS9DT01PRE9TU0xDQS5jcmwwaQYIKwYBBQUHAQEEXTBbMDMG
CCsGAQUFBzAChidodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9TU0xDQS5j
cnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTAdBgNVHREE
FjAUggkqLmkycDIuZGWCB2kycDIuZGUwDQYJKoZIhvcNAQEFBQADggEBAADqXO9c
2u5/OlJiWil85tqPkHxF0EaV/upt5mNmvJHGPSS9XvLiKtPGIOtdKuf7gLxGVdS1
SlbTvpU0iKi1nxT9ZssayudhjBsM2a7P67vOc81P1C5+RM9cBQkLnsqbxBZg0eM8
Cwh2w8hClSZvWxw3F+6jcyCp34HcHixcRiKNrZqWVKdL3ykv/cw6OoiQlK5Oy77t
4anEh7QkAWDfdMfTujBtjnIGTIYDVj1hZGbHcogrSRL5tPVr/tpvmJhwQprHiL8J
a16zGB78hVHjIyTtBJoOBBOHGCJVBxyHRipJD0kpkjXzh26cAOqI6+f/2hMiBwAy
qnh3TiGbcv2f0I4=
-----END CERTIFICATE-----

View File

@ -69,7 +69,9 @@ public class Reseeder {
"http://193.150.121.66/netDb/" + "," + "http://193.150.121.66/netDb/" + "," +
"http://netdb.i2p2.no/" + "," + "http://netdb.i2p2.no/" + "," +
"http://reseed.info/" + "," + "http://reseed.info/" + "," +
"http://i2p.feared.eu/"; "http://ieb9oopo.mooo.com";
// Temp disabled since h2ik have been AWOL since 06-03-2013
//"http://i2p.feared.eu/";
/** @since 0.8.2 */ /** @since 0.8.2 */
public static final String DEFAULT_SSL_SEED_URL = public static final String DEFAULT_SSL_SEED_URL =
@ -81,7 +83,9 @@ public class Reseeder {
"https://193.150.121.66/netDb/" + "," + "https://193.150.121.66/netDb/" + "," +
"https://netdb.i2p2.no/" + "," + "https://netdb.i2p2.no/" + "," +
"https://reseed.info/" + "," + "https://reseed.info/" + "," +
"https://i2p.feared.eu/"; "https://ieb9oopo.mooo.com";
// Temp disabled since h2ik have been AWOL since 06-03-2013
//"https://i2p.feared.eu/";
public static final String PROP_PROXY_HOST = "router.reseedProxyHost"; public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
public static final String PROP_PROXY_PORT = "router.reseedProxyPort"; public static final String PROP_PROXY_PORT = "router.reseedProxyPort";