Changeset 767476e


Ignore:
Timestamp:
Jul 18, 2016 2:39:35 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b925f51
Parents:
37ebf04
Message:

SU3File: Also look in config dir for signer certificate

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/crypto/SU3File.java

    r37ebf04 r767476e  
    315315                _signerPubkey = loadKey(_certFile);
    316316            } else {
     317                // look in both install dir and config dir for the signer cert
    317318                KeyRing ring = new DirKeyRing(new File(_context.getBaseDir(), "certificates"));
    318319                try {
     
    323324                    throw ioe;
    324325                }
    325                 if (_signerPubkey == null)
    326                     throw new IOException("unknown signer: " + _signer + " for content type: " + _contentType.getName());
     326                if (_signerPubkey == null) {
     327                    boolean diff = true;
     328                    try {
     329                        diff = !_context.getBaseDir().getCanonicalPath().equals(_context.getConfigDir().getCanonicalPath());
     330                    } catch (IOException ioe) {}
     331                    if (diff) {
     332                        ring = new DirKeyRing(new File(_context.getConfigDir(), "certificates"));
     333                        try {
     334                            _signerPubkey = ring.getKey(_signer, _contentType.getName(), _sigType);
     335                        } catch (GeneralSecurityException gse) {
     336                            IOException ioe = new IOException("keystore error");
     337                            ioe.initCause(gse);
     338                            throw ioe;
     339                        }
     340                    }
     341                    if (_signerPubkey == null)
     342                        throw new IOException("unknown signer: " + _signer + " for content type: " + _contentType.getName());
     343                }
    327344            }
    328345        }
  • history.txt

    r37ebf04 r767476e  
     12016-07-18 zzz
     2 * SU3File: Also look in config dir for signer certificate
     3
    142016-07-16 zzz
    25 * I2CP Client: Handle disconnect properly if received before first LS
  • router/java/src/net/i2p/router/RouterVersion.java

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