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

Data: Always set unpublished flag for inner LS (Enc LS2)

Browse Source 
Fix setDestination()
This commit is contained in:
zzz
2019-02-21 14:58:58 +00:00
parent b37160fa8d
commit 9fafc253b7
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/src/net/i2p/data/EncryptedLeaseSet.java
View File

@@ -88,7 +88,12 @@ public class EncryptedLeaseSet extends LeaseSet2 {
*/ */
@Override @Override
public void setDestination(Destination dest) { public void setDestination(Destination dest) {
super.setDestination(dest); if (_signature != null && _destination != null) {
if (!dest.equals(_destination))
throw new IllegalStateException();
} else {
_destination = dest;
}
SigningPublicKey spk = dest.getSigningPublicKey(); SigningPublicKey spk = dest.getSigningPublicKey();
SigType type = spk.getType(); SigType type = spk.getType();
if (type != SigType.EdDSA_SHA512_Ed25519 && if (type != SigType.EdDSA_SHA512_Ed25519 &&
@@ -295,6 +300,9 @@ public class EncryptedLeaseSet extends LeaseSet2 {
if (_signature == null) if (_signature == null)
throw new IllegalStateException("not signed"); throw new IllegalStateException("not signed");
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
// inner LS is always unpublished
int saveFlags = _flags;
setUnpublished();
try { try {
// Inner layer - type - data covered by sig // Inner layer - type - data covered by sig
baos.write(KEY_TYPE_LS2); baos.write(KEY_TYPE_LS2);
@@ -305,6 +313,8 @@ public class EncryptedLeaseSet extends LeaseSet2 {
throw new IllegalStateException("Error encrypting LS2", dfe); throw new IllegalStateException("Error encrypting LS2", dfe);
} catch (IOException ioe) { } catch (IOException ioe) {
throw new IllegalStateException("Error encrypting LS2", ioe); throw new IllegalStateException("Error encrypting LS2", ioe);
} finally {
_flags = saveFlags;
} }
I2PAppContext ctx = I2PAppContext.getGlobalContext(); I2PAppContext ctx = I2PAppContext.getGlobalContext();
@@ -453,7 +463,11 @@ public class EncryptedLeaseSet extends LeaseSet2 {
public void sign(SigningPrivateKey key) throws DataFormatException { public void sign(SigningPrivateKey key) throws DataFormatException {
Log log = I2PAppContext.getGlobalContext().logManager().getLog(EncryptedLeaseSet.class); Log log = I2PAppContext.getGlobalContext().logManager().getLog(EncryptedLeaseSet.class);
// now sign inner with the unblinded key // now sign inner with the unblinded key
// inner LS is always unpublished
int saveFlags = _flags;
setUnpublished();
super.sign(key); super.sign(key);
_flags = saveFlags;
if (log.shouldDebug()) { if (log.shouldDebug()) {
log.debug("Sign inner with key: " + key.getType() + ' ' + key.toBase64()); log.debug("Sign inner with key: " + key.getType() + ' ' + key.toBase64());
log.debug("Corresponding pubkey: " + key.toPublic().toBase64()); log.debug("Corresponding pubkey: " + key.toPublic().toBase64());