Changeset ddf056c


Ignore:
Timestamp:
Jan 27, 2016 1:26:22 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bccefb9
Parents:
ddb9777
Message:

Fixups after review:
Fix arraycopy argument order in unused SocksHeader?
Add deleted reseed cert to deletelist.txt
Fix minimum version for SSU extended options

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java

    rddb9777 rddf056c  
    4141
    4242        this.header = new byte[headerlen];
    43         System.arraycopy(this.header, 0, data, 0, headerlen);
     43        System.arraycopy(data, 0, this.header, 0, headerlen);
    4444    }
    4545   
     
    5454    public SOCKSHeader(Destination dest) {
    5555        this.header = new byte[beg.length + 60 + end.length];
    56         System.arraycopy(this.header, 0, beg, 0, beg.length);
     56        System.arraycopy(beg, 0, this.header, 0, beg.length);
    5757        String b32 = dest.toBase32();
    58         System.arraycopy(this.header, beg.length, DataHelper.getASCII(b32), 0, 60);
    59         System.arraycopy(this.header, beg.length + 60, end, 0, end.length);
     58        System.arraycopy(DataHelper.getASCII(b32), 0, this.header, beg.length, 60);
     59        System.arraycopy(end, 0, this.header, beg.length + 60, end.length);
    6060    }
    6161   
     
    6666        int namelen = (this.header[4] & 0xff);
    6767        byte[] nameBytes = new byte[namelen];
    68         System.arraycopy(nameBytes, 0, this.header, 5, namelen);
     68        System.arraycopy(this.header, 5, nameBytes, 0, namelen);
    6969        return DataHelper.getUTF8(nameBytes);
    7070    }
  • installer/resources/deletelist.txt

    rddb9777 rddf056c  
    9797certificates/ssl/netdb.i2p2.no2.crt
    9898certificates/ssl/i2p.mooo.com2.crt
     99certificates/ssl/ieb9oopo.mooo.com.crt
  • router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java

    rddb9777 rddf056c  
    133133     * No matter, the options weren't defined until this release anyway.
    134134     *
    135 **********************************************************************************************************
    136      * FIXME 0.9.23 for testing, change to 0.9.24 for release
    137      *
    138      */
    139     private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.23";
     135     */
     136    private static final String VERSION_ALLOW_EXTENDED_OPTIONS = "0.9.24";
    140137    private static final String PROP_DISABLE_EXT_OPTS = "i2np.udp.disableExtendedOptions";
    141138
Note: See TracChangeset for help on using the changeset viewer.