Changeset b78870d for router


Ignore:
Timestamp:
Jul 11, 2018 2:25:43 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d34087f
Parents:
9d2f684
Message:

NTCP2: Remove dup getHash() method

Location:
router/java/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/com/southernstorm/noise/protocol/HandshakeState.java

    r9d2f684 rb78870d  
    884884
    885885        /**
    886          *  I2P for getting current hash for siphash calculation
    887          *  @return NOT a copy, do not modify
    888          */
    889         public byte[] getHash() {
    890                 return symmetric.getHandshakeHash();
    891         }
    892 
    893         /**
    894886         *  I2P debug
    895887         */
  • router/java/src/net/i2p/router/transport/ntcp/NTCP2Payload.java

    r9d2f684 rb78870d  
    344344     * Same as DataHelper.fromLong(src, offset, 8) but allows negative result
    345345     *
    346      * Package private for NTCP2Payload.
    347      *
    348346     * @throws ArrayIndexOutOfBoundsException
    349347     * @since 0.9.36
  • router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java

    r9d2f684 rb78870d  
    443443        byte[] ask_master = doHMAC(ctx, tk, ASK);
    444444        byte[] tmp = new byte[32 + SIPHASH.length];
    445         byte[] hash = state.getHash();
     445        byte[] hash = state.getHandshakeHash();
    446446        System.arraycopy(hash, 0, tmp, 0, 32);
    447447        System.arraycopy(SIPHASH, 0, tmp, 32, SIPHASH.length);
Note: See TracChangeset for help on using the changeset viewer.