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

Fixups after review:

Browse Source 
Fix arraycopy argument order in unused SocksHeader
Add deleted reseed cert to deletelist.txt
Fix minimum version for SSU extended options
This commit is contained in:
zzz
2016-01-27 13:26:22 +00:00
parent ddb9777638
commit ddf056cf1d
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java
View File

@@ -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);
}

1
installer/resources/deletelist.txt
View File

@@ -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

5
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
View File

@@ -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";