Changeset 8c9ce56 for core


Ignore:
Timestamp:
Jan 28, 2019 3:10:30 PM (15 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
9055982
Parents:
0a8ab441 (diff), 3fca0f6 (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:

propagate from branch 'i2p.i2p.zzz.i2pcontrol' (head 1334d424003d201aa352cf57a6ba2f61241ef363)

to branch 'i2p.i2p' (head fe8a90fdbdd491e16040e3ed91a35faa72fd78f2)

Location:
core/java/src/net/i2p
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/CoreVersion.java

    r0a8ab441 r8c9ce56  
    1919    public final static String ID = "Monotone";
    2020
    21     public final static String VERSION = "0.9.37";
     21    public final static String VERSION = "0.9.38";
    2222
    2323    /**
  • core/java/src/net/i2p/client/impl/I2PSessionImpl.java

    r0a8ab441 r8c9ce56  
    210210
    211211    private static final String MIN_FAST_VERSION = "0.9.4";
    212 ////// TESTING, change to 38 before release
    213     private static final String MIN_LS2_VERSION = "0.9.37";
     212    private static final String MIN_LS2_VERSION = "0.9.38";
    214213
    215214    /** @param routerVersion as rcvd in the SetDateMessage, may be null for very old routers */
  • core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java

    r0a8ab441 r8c9ce56  
    129129              return;
    130130            }
     131            if (Boolean.parseBoolean(session.getOptions().getProperty("i2cp.dontPublishLeaseSet")))
     132                ((LeaseSet2)leaseSet).setUnpublished();
    131133        } else {
    132134            leaseSet = new LeaseSet();
  • core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java

    r0a8ab441 r8c9ce56  
    5454              return;
    5555            }
     56            if (Boolean.parseBoolean(session.getOptions().getProperty("i2cp.dontPublishLeaseSet")))
     57                ((LeaseSet2)leaseSet).setUnpublished();
    5658        } else {
    5759            leaseSet = new LeaseSet();
  • core/java/src/net/i2p/crypto/EncType.java

    r0a8ab441 r8c9ce56  
    3131    ELGAMAL_2048(0, 256, 256, EncAlgo.ELGAMAL, "ElGamal/None/NoPadding", CryptoConstants.I2P_ELGAMAL_2048_SPEC, "0"),
    3232
    33     /**  Pubkey 64 bytes; privkey 32 bytes; */
    34     EC_P256(1, 64, 32, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P256_SPEC, "0.9.20"),
    35 
    36     /**  Pubkey 96 bytes; privkey 48 bytes; */
    37     EC_P384(2, 96, 48, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P384_SPEC, "0.9.20"),
    38 
    39     /**  Pubkey 132 bytes; privkey 66 bytes; */
    40     EC_P521(3, 132, 66, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P521_SPEC, "0.9.20"),
     33    /**
     34     *  Used by i2pd. Not yet supported by Java I2P.
     35     *  Pubkey 64 bytes; privkey 32 bytes.
     36     */
     37    EC_P256(1, 64, 32, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P256_SPEC, "0.9.38"),
    4138
    4239    /**
     40     *  Reserved, not used by anybody.
     41     *  Pubkey 96 bytes; privkey 48 bytes.
     42     */
     43    EC_P384(2, 96, 48, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P384_SPEC, "0.9.38"),
     44
     45    /**
     46     *  Reserved, not used by anybody.
     47     *  Pubkey 132 bytes; privkey 66 bytes.
     48     */
     49    EC_P521(3, 132, 66, EncAlgo.EC, "EC/None/NoPadding", ECConstants.P521_SPEC, "0.9.38"),
     50
     51    /**
     52     *  Proposal 144. Not yet supported by anybody.
    4353     *  Pubkey 32 bytes; privkey 32 bytes
    4454     *  @since 0.9.38
  • core/java/src/net/i2p/data/EncryptedLeaseSet.java

    r0a8ab441 r8c9ce56  
    299299            buf.append("\n\tOffline Signature: ").append(_offlineSignature);
    300300        }
     301        buf.append("\n\tUnpublished? ").append(isUnpublished());
    301302        buf.append("\n\tSignature: ").append(_signature);
    302303        buf.append("\n\tPublished: ").append(new java.util.Date(_published));
  • core/java/src/net/i2p/data/LeaseSet2.java

    r0a8ab441 r8c9ce56  
    6060        _flags |= FLAG_UNPUBLISHED;
    6161    }
     62   
     63    /**
     64     * If true, we received this LeaseSet by a remote peer publishing it to
     65     * us, AND the unpublished flag is not set.
     66     * Default false.
     67     *
     68     *  @since 0.9.39 overridden
     69     */
     70    @Override
     71    public boolean getReceivedAsPublished() {
     72        return super.getReceivedAsPublished() && !isUnpublished();
     73    }
    6274
    6375    public String getOption(String opt) {
     
    6577            return null;
    6678        return _options.getProperty(opt);
     79    }
     80
     81    /**
     82     *  If more than one key, return the first supported one.
     83     *  If none supported, return the first one.
     84     *
     85     *  @since 0.9.39 overridden
     86     */
     87    @Override
     88    public PublicKey getEncryptionKey() {
     89        if (_encryptionKeys != null) {
     90            for (PublicKey pk : _encryptionKeys) {
     91                EncType type = pk.getType();
     92                if (type != null && type.isAvailable())
     93                    return pk;
     94            }
     95        }
     96        return _encryptionKey;
    6797    }
    6898
     
    119149    public boolean isOffline() {
    120150        return (_flags & FLAG_OFFLINE_KEYS) != 0;
     151    }
     152
     153    /**
     154     *  @return transient public key or null if not offline signed
     155     */
     156    public SigningPublicKey getTransientSigningKey() {
     157        return _transientSigningPublicKey;
    121158    }
    122159
     
    534571            }
    535572        }
     573        buf.append("\n\tUnpublished? ").append(isUnpublished());
    536574        buf.append("\n\tSignature: ").append(_signature);
    537575        buf.append("\n\tPublished: ").append(new java.util.Date(_published));
  • core/java/src/net/i2p/data/MetaLeaseSet.java

    r0a8ab441 r8c9ce56  
    172172            }
    173173        }
     174        buf.append("\n\tUnpublished? ").append(isUnpublished());
    174175        buf.append("\n\tSignature: ").append(_signature);
    175176        buf.append("\n\tPublished: ").append(new java.util.Date(_published));
Note: See TracChangeset for help on using the changeset viewer.