Changeset 2991094

Timestamp:

Jul 23, 2012 11:30:39 PM (9 years ago)

Author:

kytv <kytv@…>

Branches:

master

Children:

59b8dc4

Parents:

db6b8d3 (diff), 9823d76 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge of '03b8e025ba8c54efe24644ee68500ae2ff0ea2de'

and 'b45f7b28764f452bbd5f58ebd598f465565cab5c'

Files:

• core/java/src/net/i2p/util/LookaheadInputStream.java (modified) (1 diff)
• core/java/src/net/i2p/util/SSLEepGet.java (modified) (2 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/Router.java (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

core/java/src/net/i2p/util/LookaheadInputStream.java

@@ -45 +45 @@
         int footerRead = 0;
         while (footerRead < _footerLookahead.length) {
-            int read = in.read(_footerLookahead);
+            int read = in.read(_footerLookahead, footerRead, _footerLookahead.length - footerRead);
             if (read == -1) throw new IOException("EOF reading the footer lookahead");
             footerRead += read;

core/java/src/net/i2p/util/SSLEepGet.java

@@ -91 +91 @@
     private SavingTrustManager _stm;
 
+    private static final boolean _isAndroid = System.getProperty("java.vendor").contains("Android");
+
     /**
      *  A new SSLEepGet with a new SSLState
@@ -193 +195 @@
         if (override != null)
             success = loadCerts(new File(override), ks);
-        if (!success)
-            success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks);
-        if (!success)
-            success = loadCerts(new File(System.getProperty("java.home"), "lib/security/cacerts"), ks);
-
         if (!success) {
+            if (_isAndroid) {
+                // thru API 13. As of API 14 (ICS), the file is gone, but
+                // ks.load(null, pw) will bring in the default certs?
+                success = loadCerts(new File(System.getProperty("java.home"), "etc/security/cacerts.bks"), ks);
+            } else {
+                success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks);
+                if (!success)
+                    success = loadCerts(new File(System.getProperty("java.home"), "lib/security/cacerts"), ks);
+            }
+        }
+
+        if (!success) {
+            try {
+                // must be initted
+                ks.load(null, "changeit".toCharArray());
+            } catch (Exception e) {}
             _log.error("All key store loads failed, will only load local certificates");
         } else if (_log.shouldLog(Log.INFO)) {

history.txt

@@ +1 @@
+2012-07-24 zzz
+ * LookaheadInputStream: Fix bug causing gunzip fails, esp. on Android
+ * Router: Don't create router.ping file on Android
+ * SSLEepGet: Fix on Android (ticket #668)
+
 2012-07-21 zzz
  * i2psnark: Remove dark theme

router/java/src/net/i2p/router/Router.java

@@ -256 +256 @@
         //
         // NOW we can start the ping file thread.
-        beginMarkingLiveliness();
+        if (!System.getProperty("java.vendor").contains("Android"))
+            beginMarkingLiveliness();
 
         // Apps may use this as an easy way to determine if they are in the router JVM

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 27;
+    public final static long BUILD = 28;
 
     /** for example "-test" */