echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Data: Don't check LS1 revocation signature

Browse Source
This commit is contained in:
zzz
2020-07-28 16:14:05 +00:00
parent b97ec8da90
commit 5a9eb68160
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/src/net/i2p/data/LeaseSet.java
View File

@ -64,6 +64,7 @@ import net.i2p.util.RandomSource;
public class LeaseSet extends DatabaseEntry { public class LeaseSet extends DatabaseEntry {
protected Destination _destination; protected Destination _destination;
protected PublicKey _encryptionKey; protected PublicKey _encryptionKey;
// The revocation key for LS1, null for LS2 except blinded key for encrypted LS2
protected SigningPublicKey _signingKey; protected SigningPublicKey _signingKey;
// Keep leases in the order received, or else signature verification will fail! // Keep leases in the order received, or else signature verification will fail!
protected final List<Lease> _leases; protected final List<Lease> _leases;
@ -162,13 +163,14 @@ public class LeaseSet extends DatabaseEntry {
/** /**
* The revocation key. * The revocation key.
* Undeprecated as of 0.9.38, used for the blinded key in EncryptedLeaseSet. * Undeprecated as of 0.9.38, used for the blinded key in EncryptedLeaseSet.
* @return the revocation key for LS1, null for LS2 except blinded key for encrypted LS2
*/ */
public SigningPublicKey getSigningKey() { public SigningPublicKey getSigningKey() {
return _signingKey; return _signingKey;
} }
/** /**
* The revocation key. Unused. * The revocation key. Unused except for encrypted LS2.
* Must be the same type as the Destination's SigningPublicKey. * Must be the same type as the Destination's SigningPublicKey.
* @throws IllegalArgumentException if different type * @throws IllegalArgumentException if different type
*/ */
@ -264,35 +266,33 @@ public class LeaseSet extends DatabaseEntry {
/** /**
* Verify that the signature matches the lease set's destination's signing public key. * Verify that the signature matches the lease set's destination's signing public key.
* OR the included revocation key. * As of 0.9.47, revocation is not checked.
* *
* @return true only if the signature matches * @return true only if the signature matches
*/ */
@Override @Override
public boolean verifySignature() { public boolean verifySignature() {
if (super.verifySignature()) return super.verifySignature();
return true;
// Revocation unused (see above) // Revocation unused (see above)
boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), _signingKey); //boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), _signingKey);
return signedByRevoker; //return signedByRevoker;
} }
/** /**
* Verify that the signature matches the lease set's destination's signing public key. * Verify that the signature matches the lease set's destination's signing public key.
* OR the specified revocation key. * As of 0.9.47, revocation is not checked.
* *
* @deprecated revocation unused * @deprecated revocation unused
* @return true only if the signature matches * @return true only if the signature matches
*/ */
@Deprecated @Deprecated
public boolean verifySignature(SigningPublicKey signingKey) { public boolean verifySignature(SigningPublicKey signingKey) {
if (super.verifySignature()) return super.verifySignature();
return true;
// Revocation unused (see above) // Revocation unused (see above)
boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), signingKey); //boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), signingKey);
return signedByRevoker; //return signedByRevoker;
} }
/** /**
@ -424,12 +424,16 @@ public class LeaseSet extends DatabaseEntry {
buf.append("\n\tDestination: ").append(_destination); buf.append("\n\tDestination: ").append(_destination);
buf.append("\n\tB32: ").append(_destination.toBase32()); buf.append("\n\tB32: ").append(_destination.toBase32());
} }
buf.append("\n\tEncryptionKey: ").append(_encryptionKey); if (_encryptionKey != null)
buf.append("\n\tSigningKey: ").append(_signingKey); buf.append("\n\tEncryptionKey: ").append(_encryptionKey);
buf.append("\n\tSignature: ").append(_signature); if (_signingKey != null)
buf.append("\n\tSigningKey: ").append(_signingKey);
if (_signature != null)
buf.append("\n\tSignature: ").append(_signature);
buf.append("\n\tLeases: #").append(getLeaseCount()); buf.append("\n\tLeases: #").append(getLeaseCount());
for (int i = 0; i < getLeaseCount(); i++) for (int i = 0; i < getLeaseCount(); i++) {
buf.append("\n\t\t").append(getLease(i)); buf.append("\n\t\t").append(getLease(i));
}
buf.append("]"); buf.append("]");
return buf.toString(); return buf.toString();
} }