Changeset 54d9a29 for core


Ignore:
Timestamp:
Mar 2, 2019 9:52:12 PM (21 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cd97718
Parents:
7cbb43a
Message:

I2CP, NetDB, Console: Encrypted LS2 handling fixes (WIP)
log tweaks

Location:
core/java/src/net/i2p/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/data/EncryptedLeaseSet.java

    r7cbb43a r54d9a29  
    287287
    288288    /**
     289     *  This must be used instead of getDestination().getHash().
     290     *
    289291     *  Overridden because we have a blinded key, not a dest.
    290292     *  This is the hash of the signing public key type and the signing public key.
     
    538540    @Override
    539541    public boolean verifySignature() {
     542        // TODO use fields in super
     543        if (_decryptedLS2 != null)
     544            return _decryptedLS2.verifySignature();
    540545        if (_log.shouldDebug()) {
    541546            _log.debug("Sig verify outer with key: " + _signingKey.getType() + ' ' + _signingKey.toBase64());
     
    597602        buf.append("[EncryptedLeaseSet: ");
    598603        buf.append("\n\tBlinded Key: ").append(_signingKey);
     604        buf.append("\n\tHash: ").append(getHash());
     605        buf.append("\n\tB32: ").append(getHash().toBase32());
    599606        if (isOffline()) {
    600607            buf.append("\n\tTransient Key: ").append(_transientSigningPublicKey);
  • core/java/src/net/i2p/data/LeaseSet.java

    r7cbb43a r54d9a29  
    403403        buf.append("[LeaseSet: ");
    404404        buf.append("\n\tDestination: ").append(_destination);
     405        buf.append("\n\tB32: ").append(_destination.toBase32());
    405406        buf.append("\n\tEncryptionKey: ").append(_encryptionKey);
    406407        buf.append("\n\tSigningKey: ").append(_signingKey);
    407         //buf.append("\n\tVersion: ").append(getVersion());
    408408        buf.append("\n\tSignature: ").append(_signature);
    409409        buf.append("\n\tLeases: #").append(getLeaseCount());
  • core/java/src/net/i2p/data/LeaseSet2.java

    r7cbb43a r54d9a29  
    5656    /**
    5757     * Published timestamp, as received.
    58      * Different than getDate(), which is the earliest lease expiration.
     58     * Different than getDate() or getEarliestLeaseDate(), which are the earliest lease expiration.
    5959     *
    6060     * @return in ms, with 1 second resolution
     
    6363    public long getPublished() {
    6464        return _published;
     65    }
     66
     67    /**
     68     * Published expiration, as received.
     69     * May be different than getLatestLeaseDate(), which is the latest lease expiration.
     70     *
     71     * @return in ms, with 1 second resolution
     72     * @since 0.9.39
     73     */
     74    public long getExpires() {
     75        return _expires;
    6576    }
    6677
     
    579590        buf.append("[LeaseSet2: ");
    580591        buf.append("\n\tDestination: ").append(_destination);
     592        buf.append("\n\tB32: ").append(_destination.toBase32());
    581593        List<PublicKey> keys = getEncryptionKeys();
    582594        int sz = keys.size();
Note: See TracChangeset for help on using the changeset viewer.