Changeset c2bfb80 for router


Ignore:
Timestamp:
Jan 14, 2018 6:48:47 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
889b5ae
Parents:
8ef042a
Message:

Keyring: Separate local and remote dests on /configkeyring
Prohibit local changes on /configkeyring
Remove local keys from keyring on tunnel shutdown or encryption disable
Ensure subsession encryption setting matches primary session
(ticket #2108)

Location:
router/java/src/net/i2p/router
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/PersistentKeyRing.java

    r8ef042a rc2bfb80  
    3939    @Override
    4040    public SessionKey remove(Object o) {
    41         if (o != null && o instanceof Hash) {
     41        SessionKey rv = super.remove(o);
     42        if (rv != null && o != null && o instanceof Hash) {
    4243            Hash h = (Hash) o;
    4344            _ctx.router().saveConfig(PROP_PFX + h.toBase64().replace("=", "$"), null);
    4445        }
    45         return super.remove(o);
     46        return rv;
    4647    }
    4748
  • router/java/src/net/i2p/router/RouterVersion.java

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