Changeset 7d11fb26 for router


Ignore:
Timestamp:
Feb 3, 2019 12:59:53 PM (18 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0e710f87
Parents:
d7808cd
Message:

I2CP: Remove revocation private key from CreateLeaseset2 message
Use correct key to sign SessionConfig? with offline keys
LeaseSetKeys? cleanups

Location:
router/java/src/net/i2p/router
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/KeyManager.java

    rd7808cd r7d11fb26  
    110110    public synchronized SigningPublicKey getSigningPublicKey() { return _signingPublicKey; }
    111111   
    112     /** client */
     112    /**
     113     *  client
     114     *  @param leaseRevocationPrivateKey unused, may be null
     115     */
    113116    public void registerKeys(Destination dest, SigningPrivateKey leaseRevocationPrivateKey, PrivateKey endpointDecryptionKey) {
    114117        if (_log.shouldLog(Log.INFO))
  • router/java/src/net/i2p/router/LeaseSetKeys.java

    rd7808cd r7d11fb26  
    99 */
    1010
    11 import java.io.IOException;
    12 import java.io.InputStream;
    13 import java.io.OutputStream;
    14 
    15 import net.i2p.data.DataFormatException;
    16 import net.i2p.data.DataHelper;
    17 import net.i2p.data.DataStructureImpl;
    1811import net.i2p.data.Destination;
    1912import net.i2p.data.PrivateKey;
     
    2215/**
    2316 * Wrap up the keys given to the router when a destination connects to it.
    24  * Used only by KeyManager.
     17 * Used by KeyManager, ClientMessageEventListener, GarlicMessageReceiver.
    2518 */
    2619public class LeaseSetKeys {
     
    3023    /**
    3124     *  @param dest unused
    32      *  @param revocationKey unused
     25     *  @param revocationKey unused, may be null
    3326     *  @param decryptionKey non-null
    3427     */
  • router/java/src/net/i2p/router/client/ClientMessageEventListener.java

    rd7808cd r7d11fb26  
    509509        }
    510510        int type = ls.getType();
    511         if (type != DatabaseEntry.KEY_TYPE_META_LS2 &&
    512             (message.getPrivateKey() == null || message.getSigningPrivateKey() == null)) {
     511        if (type != DatabaseEntry.KEY_TYPE_META_LS2 && message.getPrivateKey() == null) {
     512            if (_log.shouldLog(Log.ERROR))
     513                _log.error("Null private keys: " + message);
     514            _runner.disconnectClient("Invalid CreateLeaseSetMessage - null private keys");
     515            return;
     516        }
     517        if (type == DatabaseEntry.KEY_TYPE_LEASESET && message.getSigningPrivateKey() == null) {
     518            // revocation keys only in LS1
    513519            if (_log.shouldLog(Log.ERROR))
    514520                _log.error("Null private keys: " + message);
  • router/java/src/net/i2p/router/client/LeaseRequestState.java

    rd7808cd r7d11fb26  
    1111import net.i2p.data.LeaseSet;
    1212import net.i2p.data.PrivateKey;
    13 import net.i2p.data.SigningPrivateKey;
    1413import net.i2p.router.Job;
    1514
Note: See TracChangeset for help on using the changeset viewer.