From ddf056cf1da5f292a488dd9731df279ef935fd2c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 27 Jan 2016 13:26:22 +0000
Subject: [PATCH] Fixups after review: Fix arraycopy argument order in unused
SocksHeader Add deleted reseed cert to deletelist.txt Fix minimum version for
SSU extended options
---
.../java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java | 10 +++++-----
installer/resources/deletelist.txt | 1 +
.../i2p/router/transport/udp/EstablishmentManager.java | 5 +----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
index 6c61e09597..25baa879ca 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
@@ -40,7 +40,7 @@ public class SOCKSHeader {
throw new IllegalArgumentException("Header too short: " + data.length);
this.header = new byte[headerlen];
- System.arraycopy(this.header, 0, data, 0, headerlen);
+ System.arraycopy(data, 0, this.header, 0, headerlen);
}
private static final byte[] beg = {0,0,0,3,60};
@@ -53,10 +53,10 @@ public class SOCKSHeader {
*/
public SOCKSHeader(Destination dest) {
this.header = new byte[beg.length + 60 + end.length];
- System.arraycopy(this.header, 0, beg, 0, beg.length);
+ System.arraycopy(beg, 0, this.header, 0, beg.length);
String b32 = dest.toBase32();
- System.arraycopy(this.header, beg.length, DataHelper.getASCII(b32), 0, 60);
- System.arraycopy(this.header, beg.length + 60, end, 0, end.length);
+ System.arraycopy(DataHelper.getASCII(b32), 0, this.header, beg.length, 60);
+ System.arraycopy(end, 0, this.header, beg.length + 60, end.length);
}
public String getHost() {
@@ -65,7 +65,7 @@ public class SOCKSHeader {
return null;
int namelen = (this.header[4] & 0xff);
byte[] nameBytes = new byte[namelen];
- System.arraycopy(nameBytes, 0, this.header, 5, namelen);
+ System.arraycopy(this.header, 5, nameBytes, 0, namelen);
return DataHelper.getUTF8(nameBytes);
}
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index 43212a8e30..ef420c3764 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -96,3 +96,4 @@ certificates/ssl/jp.reseed.i2p2.no.crt
certificates/ssl/ieb9oopo.mooo.com2.crt
certificates/ssl/netdb.i2p2.no2.crt
certificates/ssl/i2p.mooo.com2.crt
+certificates/ssl/ieb9oopo.mooo.com.crt
diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
index 0fd9c83af9..075eb04b98 100644
--- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
@@ -132,11 +132,8 @@ class EstablishmentManager {
* but i2pd hasn't recognized it until this release.
* No matter, the options weren't defined until this release anyway.
*
-**********************************************************************************************************
- * FIXME 0.9.23 for testing, change to 0.9.24 for release
- *
*/
- private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.23";
+ private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.24";
private static final String PROP_DISABLE_EXT_OPTS = "i2np.udp.disableExtendedOptions";
--
GitLab