From 43f506216908d7f1275d930ef8950d09e625abfb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 12 Sep 2013 21:47:25 +0000
Subject: [PATCH] SSLEepGet: Move all certificates to certificates/ssl, in
preparation for other certificate uses by SU3File
---
core/java/src/net/i2p/util/SSLEepGet.java | 14 ++++++++------
.../certificates/{ => ssl}/193.150.121.66.crt | 0
.../certificates/{ => ssl}/cert.smartcom.org.crt | 0
.../certificates/{ => ssl}/i2p.feared.eu.crt | 0
.../certificates/{ => ssl}/i2p.mooo.com.crt | 0
.../{i2pprojekt.de.cert => ssl/i2pprojekt.de.crt} | 0
.../certificates/{ => ssl}/ieb9oopo.mooo.com.crt | 0
.../certificates/{ => ssl}/netdb.i2p2.de.crt | 0
.../certificates/{ => ssl}/netdb.i2p2.no.crt | 0
.../certificates/{ => ssl}/reseed.info.crt | 0
.../certificates/{ => ssl}/reseed.pkol.de.crt | 0
.../certificates/{ => ssl}/www.cacert.org.crt | 0
installer/resources/deletelist.txt | 12 ++++++++++++
tests/scripts/checkcerts.sh | 2 +-
14 files changed, 21 insertions(+), 7 deletions(-)
rename installer/resources/certificates/{ => ssl}/193.150.121.66.crt (100%)
rename installer/resources/certificates/{ => ssl}/cert.smartcom.org.crt (100%)
rename installer/resources/certificates/{ => ssl}/i2p.feared.eu.crt (100%)
rename installer/resources/certificates/{ => ssl}/i2p.mooo.com.crt (100%)
rename installer/resources/certificates/{i2pprojekt.de.cert => ssl/i2pprojekt.de.crt} (100%)
rename installer/resources/certificates/{ => ssl}/ieb9oopo.mooo.com.crt (100%)
rename installer/resources/certificates/{ => ssl}/netdb.i2p2.de.crt (100%)
rename installer/resources/certificates/{ => ssl}/netdb.i2p2.no.crt (100%)
rename installer/resources/certificates/{ => ssl}/reseed.info.crt (100%)
rename installer/resources/certificates/{ => ssl}/reseed.pkol.de.crt (100%)
rename installer/resources/certificates/{ => ssl}/www.cacert.org.crt (100%)
diff --git a/core/java/src/net/i2p/util/SSLEepGet.java b/core/java/src/net/i2p/util/SSLEepGet.java
index 839b319892..e7a060230f 100644
--- a/core/java/src/net/i2p/util/SSLEepGet.java
+++ b/core/java/src/net/i2p/util/SSLEepGet.java
@@ -72,7 +72,7 @@ import net.i2p.data.DataHelper;
* Fails on bad certs (must have a valid cert chain)
* Self-signed certs or CAs not in the JVM key store must be loaded to be trusted.
*
- * Since 0.8.2, loads additional trusted CA certs from $I2P/certificates/ and ~/.i2p/certificates/
+ * Since 0.8.2, loads additional trusted CA certs from $I2P/certificates/ssl/ and ~/.i2p/certificates/ssl/
*
* @author zzz
* @since 0.7.10
@@ -87,6 +87,8 @@ public class SSLEepGet extends EepGet {
/** may be null if init failed */
private SavingTrustManager _stm;
+ private static final String CERT_DIR = "certificates/ssl";
+
/**
* A new SSLEepGet with a new SSLState
*/
@@ -171,8 +173,8 @@ public class SSLEepGet extends EepGet {
* else from $JAVA_HOME/lib/security/jssacacerts,
* else from $JAVA_HOME/lib/security/cacerts.
*
- * Then adds certs found in the $I2P/certificates/ directory
- * and in the ~/.i2p/certificates/ directory.
+ * Then adds certs found in the $I2P/certificates/ssl/ directory
+ * and in the ~/.i2p/certificates/ssl/ directory.
*
* @return null on failure
* @since 0.8.2
@@ -188,13 +190,13 @@ public class SSLEepGet extends EepGet {
_log.info("Loaded " + count + " default trusted certificates");
}
- File dir = new File(_context.getBaseDir(), "certificates");
+ File dir = new File(_context.getBaseDir(), CERT_DIR);
int adds = KeyStoreUtil.addCerts(dir, ks);
int totalAdds = adds;
if (adds > 0 && _log.shouldLog(Log.INFO))
_log.info("Loaded " + adds + " trusted certificates from " + dir.getAbsolutePath());
if (!_context.getBaseDir().getAbsolutePath().equals(_context.getConfigDir().getAbsolutePath())) {
- dir = new File(_context.getConfigDir(), "certificates");
+ dir = new File(_context.getConfigDir(), CERT_DIR);
adds = KeyStoreUtil.addCerts(dir, ks);
totalAdds += adds;
if (adds > 0 && _log.shouldLog(Log.INFO))
@@ -202,7 +204,7 @@ public class SSLEepGet extends EepGet {
}
dir = new File(System.getProperty("user.dir"));
if (!_context.getBaseDir().getAbsolutePath().equals(dir.getAbsolutePath())) {
- dir = new File(_context.getConfigDir(), "certificates");
+ dir = new File(_context.getConfigDir(), CERT_DIR);
adds = KeyStoreUtil.addCerts(dir, ks);
totalAdds += adds;
if (adds > 0 && _log.shouldLog(Log.INFO))
diff --git a/installer/resources/certificates/193.150.121.66.crt b/installer/resources/certificates/ssl/193.150.121.66.crt
similarity index 100%
rename from installer/resources/certificates/193.150.121.66.crt
rename to installer/resources/certificates/ssl/193.150.121.66.crt
diff --git a/installer/resources/certificates/cert.smartcom.org.crt b/installer/resources/certificates/ssl/cert.smartcom.org.crt
similarity index 100%
rename from installer/resources/certificates/cert.smartcom.org.crt
rename to installer/resources/certificates/ssl/cert.smartcom.org.crt
diff --git a/installer/resources/certificates/i2p.feared.eu.crt b/installer/resources/certificates/ssl/i2p.feared.eu.crt
similarity index 100%
rename from installer/resources/certificates/i2p.feared.eu.crt
rename to installer/resources/certificates/ssl/i2p.feared.eu.crt
diff --git a/installer/resources/certificates/i2p.mooo.com.crt b/installer/resources/certificates/ssl/i2p.mooo.com.crt
similarity index 100%
rename from installer/resources/certificates/i2p.mooo.com.crt
rename to installer/resources/certificates/ssl/i2p.mooo.com.crt
diff --git a/installer/resources/certificates/i2pprojekt.de.cert b/installer/resources/certificates/ssl/i2pprojekt.de.crt
similarity index 100%
rename from installer/resources/certificates/i2pprojekt.de.cert
rename to installer/resources/certificates/ssl/i2pprojekt.de.crt
diff --git a/installer/resources/certificates/ieb9oopo.mooo.com.crt b/installer/resources/certificates/ssl/ieb9oopo.mooo.com.crt
similarity index 100%
rename from installer/resources/certificates/ieb9oopo.mooo.com.crt
rename to installer/resources/certificates/ssl/ieb9oopo.mooo.com.crt
diff --git a/installer/resources/certificates/netdb.i2p2.de.crt b/installer/resources/certificates/ssl/netdb.i2p2.de.crt
similarity index 100%
rename from installer/resources/certificates/netdb.i2p2.de.crt
rename to installer/resources/certificates/ssl/netdb.i2p2.de.crt
diff --git a/installer/resources/certificates/netdb.i2p2.no.crt b/installer/resources/certificates/ssl/netdb.i2p2.no.crt
similarity index 100%
rename from installer/resources/certificates/netdb.i2p2.no.crt
rename to installer/resources/certificates/ssl/netdb.i2p2.no.crt
diff --git a/installer/resources/certificates/reseed.info.crt b/installer/resources/certificates/ssl/reseed.info.crt
similarity index 100%
rename from installer/resources/certificates/reseed.info.crt
rename to installer/resources/certificates/ssl/reseed.info.crt
diff --git a/installer/resources/certificates/reseed.pkol.de.crt b/installer/resources/certificates/ssl/reseed.pkol.de.crt
similarity index 100%
rename from installer/resources/certificates/reseed.pkol.de.crt
rename to installer/resources/certificates/ssl/reseed.pkol.de.crt
diff --git a/installer/resources/certificates/www.cacert.org.crt b/installer/resources/certificates/ssl/www.cacert.org.crt
similarity index 100%
rename from installer/resources/certificates/www.cacert.org.crt
rename to installer/resources/certificates/ssl/www.cacert.org.crt
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index 8ff0ead3ba..5a17dab760 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -68,3 +68,15 @@ docs/initialNews/initialNews_nl.xml
docs/initialNews/initialNews_pt.xml
docs/initialNews/initialNews_ru.xml
docs/initialNews/initialNews_sv.xml
+# certificates moved to certificates/ssl
+certificates/193.150.121.66.crt
+certificates/cert.smartcom.org.crt
+certificates/i2p.feared.eu.crt
+certificates/i2p.mooo.com.crt
+certificates/i2pprojekt.de.cert
+certificates/ieb9oopo.mooo.com.crt
+certificates/netdb.i2p2.de.crt
+certificates/netdb.i2p2.no.crt
+certificates/reseed.info.crt
+certificates/reseed.pkol.de.crt
+certificates/www.cacert.org.crt
diff --git a/tests/scripts/checkcerts.sh b/tests/scripts/checkcerts.sh
index 000bd360f5..1d01087360 100755
--- a/tests/scripts/checkcerts.sh
+++ b/tests/scripts/checkcerts.sh
@@ -152,7 +152,7 @@ elif [ $(which certtool) ]; then : ;else
exit 1
fi
-cd `dirname $0`/../../installer/resources/certificates
+cd `dirname $0`/../../installer/resources/certificates/ssl
for i in *.crt *.cert
do
--
GitLab