From b78870de54a1c1028bdf74667c5f0bbcb0b2bab1 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 11 Jul 2018 14:25:43 +0000 Subject: [PATCH] NTCP2: Remove dup getHash() method --- .../com/southernstorm/noise/protocol/HandshakeState.java | 8 -------- .../src/net/i2p/router/transport/ntcp/NTCP2Payload.java | 2 -- .../net/i2p/router/transport/ntcp/OutboundNTCP2State.java | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/router/java/src/com/southernstorm/noise/protocol/HandshakeState.java b/router/java/src/com/southernstorm/noise/protocol/HandshakeState.java index 377e4f1fa..df4e9f311 100644 --- a/router/java/src/com/southernstorm/noise/protocol/HandshakeState.java +++ b/router/java/src/com/southernstorm/noise/protocol/HandshakeState.java @@ -882,14 +882,6 @@ public class HandshakeState implements Destroyable { return symmetric.getChainingKey(); } - /** - * I2P for getting current hash for siphash calculation - * @return NOT a copy, do not modify - */ - public byte[] getHash() { - return symmetric.getHandshakeHash(); - } - /** * I2P debug */ diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCP2Payload.java b/router/java/src/net/i2p/router/transport/ntcp/NTCP2Payload.java index 01c686dec..516aac349 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCP2Payload.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCP2Payload.java @@ -343,8 +343,6 @@ class NTCP2Payload { * Big endian. * Same as DataHelper.fromLong(src, offset, 8) but allows negative result * - * Package private for NTCP2Payload. - * * @throws ArrayIndexOutOfBoundsException * @since 0.9.36 */ diff --git a/router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java b/router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java index 688824f4a..5295cf2e9 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java +++ b/router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java @@ -442,7 +442,7 @@ class OutboundNTCP2State implements EstablishState { tk = new SessionKey(temp_key); byte[] ask_master = doHMAC(ctx, tk, ASK); byte[] tmp = new byte[32 + SIPHASH.length]; - byte[] hash = state.getHash(); + byte[] hash = state.getHandshakeHash(); System.arraycopy(hash, 0, tmp, 0, 32); System.arraycopy(SIPHASH, 0, tmp, 32, SIPHASH.length); tk = new SessionKey(ask_master);