Changeset 2991094


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/util/LookaheadInputStream.java

    rdb6b8d3 r2991094  
    4545        int footerRead = 0;
    4646        while (footerRead < _footerLookahead.length) {
    47             int read = in.read(_footerLookahead);
     47            int read = in.read(_footerLookahead, footerRead, _footerLookahead.length - footerRead);
    4848            if (read == -1) throw new IOException("EOF reading the footer lookahead");
    4949            footerRead += read;
  • core/java/src/net/i2p/util/SSLEepGet.java

    rdb6b8d3 r2991094  
    9191    private SavingTrustManager _stm;
    9292
     93    private static final boolean _isAndroid = System.getProperty("java.vendor").contains("Android");
     94
    9395    /**
    9496     *  A new SSLEepGet with a new SSLState
     
    193195        if (override != null)
    194196            success = loadCerts(new File(override), ks);
    195         if (!success)
    196             success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks);
    197         if (!success)
    198             success = loadCerts(new File(System.getProperty("java.home"), "lib/security/cacerts"), ks);
    199 
    200197        if (!success) {
     198            if (_isAndroid) {
     199                // thru API 13. As of API 14 (ICS), the file is gone, but
     200                // ks.load(null, pw) will bring in the default certs?
     201                success = loadCerts(new File(System.getProperty("java.home"), "etc/security/cacerts.bks"), ks);
     202            } else {
     203                success = loadCerts(new File(System.getProperty("java.home"), "lib/security/jssecacerts"), ks);
     204                if (!success)
     205                    success = loadCerts(new File(System.getProperty("java.home"), "lib/security/cacerts"), ks);
     206            }
     207        }
     208
     209        if (!success) {
     210            try {
     211                // must be initted
     212                ks.load(null, "changeit".toCharArray());
     213            } catch (Exception e) {}
    201214            _log.error("All key store loads failed, will only load local certificates");
    202215        } else if (_log.shouldLog(Log.INFO)) {
  • history.txt

    rdb6b8d3 r2991094  
     12012-07-24 zzz
     2 * LookaheadInputStream: Fix bug causing gunzip fails, esp. on Android
     3 * Router: Don't create router.ping file on Android
     4 * SSLEepGet: Fix on Android (ticket #668)
     5
    162012-07-21 zzz
    27 * i2psnark: Remove dark theme
  • router/java/src/net/i2p/router/Router.java

    rdb6b8d3 r2991094  
    256256        //
    257257        // NOW we can start the ping file thread.
    258         beginMarkingLiveliness();
     258        if (!System.getProperty("java.vendor").contains("Android"))
     259            beginMarkingLiveliness();
    259260
    260261        // 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

    rdb6b8d3 r2991094  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 27;
     21    public final static long BUILD = 28;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.