From 5a9eb68160296be93b83c90f04a43944fb434c2b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 28 Jul 2020 16:14:05 +0000
Subject: [PATCH] Data: Don't check LS1 revocation signature
---
core/java/src/net/i2p/data/LeaseSet.java | 34 +++++++++++++-----------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java
index d2dd4a82c6..601acdcc92 100644
--- a/core/java/src/net/i2p/data/LeaseSet.java
+++ b/core/java/src/net/i2p/data/LeaseSet.java
@@ -64,6 +64,7 @@ import net.i2p.util.RandomSource;
public class LeaseSet extends DatabaseEntry {
protected Destination _destination;
protected PublicKey _encryptionKey;
+ // The revocation key for LS1, null for LS2 except blinded key for encrypted LS2
protected SigningPublicKey _signingKey;
// Keep leases in the order received, or else signature verification will fail!
protected final List<Lease> _leases;
@@ -162,13 +163,14 @@ public class LeaseSet extends DatabaseEntry {
/**
* The revocation key.
* 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() {
return _signingKey;
}
/**
- * The revocation key. Unused.
+ * The revocation key. Unused except for encrypted LS2.
* Must be the same type as the Destination's SigningPublicKey.
* @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.
- * OR the included revocation key.
+ * As of 0.9.47, revocation is not checked.
*
* @return true only if the signature matches
*/
@Override
public boolean verifySignature() {
- if (super.verifySignature())
- return true;
+ return super.verifySignature();
// Revocation unused (see above)
- boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), _signingKey);
- return signedByRevoker;
+ //boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), _signingKey);
+ //return signedByRevoker;
}
/**
* 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
* @return true only if the signature matches
*/
@Deprecated
public boolean verifySignature(SigningPublicKey signingKey) {
- if (super.verifySignature())
- return true;
+ return super.verifySignature();
// Revocation unused (see above)
- boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), signingKey);
- return signedByRevoker;
+ //boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), signingKey);
+ //return signedByRevoker;
}
/**
@@ -424,12 +424,16 @@ public class LeaseSet extends DatabaseEntry {
buf.append("\n\tDestination: ").append(_destination);
buf.append("\n\tB32: ").append(_destination.toBase32());
}
- buf.append("\n\tEncryptionKey: ").append(_encryptionKey);
- buf.append("\n\tSigningKey: ").append(_signingKey);
- buf.append("\n\tSignature: ").append(_signature);
+ if (_encryptionKey != null)
+ buf.append("\n\tEncryptionKey: ").append(_encryptionKey);
+ if (_signingKey != null)
+ buf.append("\n\tSigningKey: ").append(_signingKey);
+ if (_signature != null)
+ buf.append("\n\tSignature: ").append(_signature);
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("]");
return buf.toString();
}
--
GitLab