dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-03-29 09:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Client: Deprecate getters for unused encryption private key

Browse Source
This commit is contained in:
zzz
2025-02-21 09:05:55 -05:00
parent 24614316be
commit fbd0be941a
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/src/net/i2p/client/I2PSession.java
View File

@@ -298,8 +298,9 @@ public interface I2PSession {
/**
* Retrieve the decryption PrivateKey associated with the Destination
*
* @deprecated this key is unused
*/
@Deprecated
public PrivateKey getDecryptionKey();
/**

4
core/java/src/net/i2p/client/impl/I2PSessionImpl.java
View File

@@ -370,7 +370,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
throw new I2PSessionException("Subsession request already pending");
sub = new SubSession(this, privateKeyStream, opts);
for (SubSession ss : _subsessions) {
if (ss.getDecryptionKey().equals(sub.getDecryptionKey()) &&
if (/* ss.getDecryptionKey().equals(sub.getDecryptionKey()) && */
ss.getPrivateKey().equals(sub.getPrivateKey())) {
throw new I2PSessionException("Dup subsession");
}
@@ -1145,7 +1145,9 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
/**
* Retrieve the decryption PrivateKey
* @deprecated this key is unused
*/
@Deprecated
public PrivateKey getDecryptionKey() { return _privateKey; }
/**

4
core/java/src/net/i2p/client/impl/SubSession.java
View File

@@ -47,8 +47,8 @@ class SubSession extends I2PSessionMuxedImpl {
public SubSession(I2PSession primary, InputStream destKeyStream, Properties options) throws I2PSessionException {
super((I2PSessionMuxedImpl)primary, destKeyStream, options);
_primary = (I2PSessionMuxedImpl) primary;
if (!getDecryptionKey().equals(_primary.getDecryptionKey()))
throw new I2PSessionException("encryption key mismatch");
//if (!getDecryptionKey().equals(_primary.getDecryptionKey()))
// throw new I2PSessionException("encryption key mismatch");
if (getPrivateKey().equals(_primary.getPrivateKey()))
throw new I2PSessionException("signing key must differ");
// state management

2
core/java/src/net/i2p/data/PrivateKeyFile.java
View File

@@ -824,7 +824,9 @@ public class PrivateKeyFile {
* Private key may be random data or all zeros for Destinations as of 0.9.57
*
* @return null on error or if not initialized
* @deprecated this key is unused
*/
@Deprecated
public PrivateKey getPrivKey() {
try {
// call this to force initialization