Changeset 8eb7cf7


Ignore:
Timestamp:
Apr 10, 2013 5:24:11 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
28f1170
Parents:
2557a0b (diff), 1be0695 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.jetty7' (head 12e512b792594fe6a291ad3ab303fca30228391b)

to branch 'i2p.i2p' (head f3775dd82af85ba335258bd9f0fc06131a1daaa9)

Files:
12 edited

Legend:

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

    r2557a0b r8eb7cf7  
    6666        write(_buf1, 0, 1);
    6767    }
     68
    6869    @Override
    6970    public void write(byte buf[]) throws IOException {
    7071        write(buf, 0, buf.length);
    7172    }
     73
    7274    @Override
    7375    public void write(byte buf[], int off, int len) throws IOException {
     
    182184                            } else if ("proxy-authenticate".equals(lcKey)) {
    183185                                // filter this hop-by-hop header; outproxy authentication must be configured in I2PTunnelHTTPClient
     186                                // see e.g. http://blog.c22.cc/2013/03/11/privoxy-proxy-authentication-credential-exposure-cve-2013-2503/
    184187                            } else {
    185188                                if ("content-length".equals(lcKey)) {
     
    273276                    if (_log.shouldLog(Log.DEBUG))
    274277                        _log.debug("Read " + read + " and writing it to the browser/streams");
    275 ;                   _out.write(buf, 0, read);
     278                    _out.write(buf, 0, read);
    276279                    _out.flush();
    277280                    written += read;
  • apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java

    r2557a0b r8eb7cf7  
    5050                                                0, 0, (byte) 0xff, (byte) 0xff, 0, 0, 0, 1 };
    5151
    52     /** dummy macs and ethertype */
     52    /** dummy macs, IPv4 ethertype */
    5353    private static final byte[] MAC_HEADER = { 1, 2, 3, 4, 5, 6,
    5454                                               1, 2, 3, 4, 5, 6,
    55                                                (byte) 0x80, 0 };
     55                                               (byte) 0x08, 0 };
    5656    private static final byte[] IP_HEADER_1 = { 0x45, 0 };  // the length goes after this
    5757    private static final byte[] IP_HEADER_2 = { 0x12, 0x34, 0x40, 0, 64, 6 };  // ID, flags, TTL and TCP
  • core/java/src/net/i2p/crypto/ElGamalAESEngine.java

    r2557a0b r8eb7cf7  
    106106        if (key != null) {
    107107            //if (_log.shouldLog(Log.DEBUG)) _log.debug("Key is known for tag " + st);
    108             long id = _context.random().nextLong();
    109108            if (_log.shouldLog(Log.DEBUG))
    110                 _log.debug(id + ": Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ );
     109                _log.debug("Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ );
    111110           
    112111            decrypted = decryptExistingSession(data, key, targetPrivateKey, foundTags, usedKey, foundKey);
     
    114113                _context.statManager().updateFrequency("crypto.elGamalAES.decryptExistingSession");
    115114                if ( (!foundTags.isEmpty()) && (_log.shouldLog(Log.DEBUG)) )
    116                     _log.debug(id + ": ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
     115                    _log.debug("ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
    117116                wasExisting = true;
    118117            } else {
    119118                _context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed");
    120119                if (_log.shouldLog(Log.WARN)) {
    121                     _log.warn(id + ": ElG decrypt fail: known tag [" + st + "], failed decrypt");
     120                    _log.warn("ElG decrypt fail: known tag [" + st + "], failed decrypt");
    122121                }
    123122            }
     
    569568     * </pre>
    570569     *
     570     * @param target unused, this is AES encrypt only using the session key and tag
    571571     * @param tagsForDelivery session tags to be associated with the key or null;
    572572     *                        200 max enforced at receiver
  • installer/c/i2pExe/I2P.rc

    r2557a0b r8eb7cf7  
    9595// Icon with lowest ID value placed first to ensure application icon
    9696// remains consistent on all systems.
    97 IDI_ICON1               ICON                    "start.ico"
     97IDI_ICON1               ICON                    "../../resources/start.ico"
    9898#endif    // English (U.S.) resources
    9999/////////////////////////////////////////////////////////////////////////////
  • installer/resources/proxy/dnfh-header.ht

    r2557a0b r8eb7cf7  
    2020<p>
    2121The eepsite was not found in your router's addressbook.
    22 Check the link or find a BASE64 address.
    23 If you have the BASE64 address,  paste it into your userhosts.txt using
    24 <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
    25 use a BASE64 address helper, or use a jump service link below.
     22Check the link or find a Base 32 or Base 64 address.
     23If you have the Base 64 address,
     24<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">add it to your addressbook</a>.
     25Otherwise, find a Base 32 or address helper link, or use a jump service link below.
    2626</p>
    2727<p>
  • installer/resources/proxy/dnfh-header_de.ht

    r2557a0b r8eb7cf7  
    2121Die Eepseite konnte nicht im Adressbuch des Routers gefunden werden.
    2222Überprüfen Sie den Link oder finden Sie eine BASIS64-Adresse!
    23 Wenn Sie eine BASIS64-Adresse haben, fügen Sie diese unter folgendem Link zu Ihrer userhosts.txt hinzu:
    24 <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
     23Wenn Sie eine BASIS64-Adresse haben, fügen Sie diese unter folgendem Link zu Ihrer hosts.txt hinzu:
     24<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
    2525benutzen Sie einen BASIS64-Adresshelfer oder einen der folgenden Sprungdienste:
    2626</p>
  • installer/resources/proxy/dnfh-header_fr.ht

    r2557a0b r8eb7cf7  
    2020<p>
    2121Le site eep n'était pas dans le carnet d'adresses de votre routeur.
    22 Vérifiez le lien ou trouvez l'adresse BASE64.
    23 Si vous avez l'adresse BASE64,  reportez-la dans votre fichier userhosts.txt en passant par
    24 <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
    25 utilisez un lien d'adresse BASE64, ou un service de saut (jump) en  lien ci-dessous.
     22Vérifiez le lien ou trouvez l'adresse Base 64.
     23Si vous avez l'adresse Base 64,  reportez-la dans votre fichier hosts.txt en passant par
     24<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
     25utilisez un lien d'adresse Base 64, ou un service de saut (jump) en  lien ci-dessous.
    2626</p>
    2727<p>
  • installer/resources/proxy/dnfh-header_nl.ht

    r2557a0b r8eb7cf7  
    2020<p>
    2121De eepsite was niet gevonden in je router's adresboek.
    22 Controlleer de link of zoek een BASE64 adres.
    23 Indien je een BASE64 adres hebt, plak het in je userhosts.txt via
    24 <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
    25 gebruikt een BASE64 adres helper, of gebruik een jump service link hieronder.
     22Controlleer de link of zoek een Base 64 adres.
     23Indien je een Base 64 adres hebt, plak het in je hosts.txt via
     24<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
     25gebruikt een Base 64 adres helper, of gebruik een jump service link hieronder.
    2626</p>
    2727<p>
  • installer/resources/proxy/dnfh-header_ru.ht

    r2557a0b r8eb7cf7  
    2626</p>
    2727<p>
    28 Если ни один из jump-сервисов не помог, попробуйте найти BASE64-адрес этого сайта. Добавьте BASE64-адрес в Ваш файл userhosts.txt используя <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>.
     28Если ни один из jump-сервисов не помог, попробуйте найти Base 64-адрес этого сайта. Добавьте Base 64-адрес в Ваш файл hosts.txt используя <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>.
    2929</p>
    3030<p>
  • installer/resources/proxy/dnfh-header_zh.ht

    r2557a0b r8eb7cf7  
    2020<p>
    2121您所访问的匿名站点(的目标密钥)不存在于您路由器的地址簿中。
    22 检查链接,或寻找对应的BASE64地址.
    23 如果您知道对应的BASE64地址请通过
    24 <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>
    25 将其复制入您的 userhosts.txt 中,直接使用 BASE64 地址访问,或使用下面的跳转链接。<br><br>
     22检查链接,或寻找对应的Base 64地址.
     23如果您知道对应的Base 64地址请通过
     24<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>
     25将其复制入您的 hosts.txt 中,直接使用 Base 64 地址访问,或使用下面的跳转链接。<br><br>
    2626经常见到此页面? 请参见 <a href="http://www.i2p2.i2p/faq.html#subscriptions"> FAQ 常见问答</a>
    2727中的 <a href="http://127.0.0.1:7657/susidns/config.jsp">添加更多订阅到地址簿中</a>。
  • router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java

    r2557a0b r8eb7cf7  
    223223        //_fromHash = new Hash(fromData);
    224224       
    225         boolean tunnelSpecified = false;
    226         switch (data[curIndex]) {
    227             case DataHelper.BOOLEAN_TRUE:
    228                 tunnelSpecified = true;
    229                 break;
    230             case DataHelper.BOOLEAN_FALSE:
    231                 tunnelSpecified = false;
    232                 break;
    233             default:
    234                 throw new I2NPMessageException("Tunnel must be explicitly specified (or not)");
    235         }
     225        // as of 0.9.6, ignore other 7 bits of the flag byte
     226        // TODO store the whole flag byte
     227        boolean tunnelSpecified = (data[curIndex] & 0x01) != 0;
    236228        curIndex++;
    237229       
     
    278270        System.arraycopy(_fromHash.getData(), 0, out, curIndex, Hash.HASH_LENGTH);
    279271        curIndex += Hash.HASH_LENGTH;
     272        // TODO allow specification of the other 7 bits of the flag byte
    280273        if (_replyTunnel != null) {
    281             out[curIndex++] = DataHelper.BOOLEAN_TRUE;
     274            out[curIndex++] = 0x01;
    282275            byte id[] = DataHelper.toLong(4, _replyTunnel.getTunnelId());
    283276            System.arraycopy(id, 0, out, curIndex, 4);
    284277            curIndex += 4;
    285278        } else {
    286             out[curIndex++] = DataHelper.BOOLEAN_FALSE;
     279            out[curIndex++] = 0x00;
    287280        }
    288281        if ( (_dontIncludePeers == null) || (_dontIncludePeers.isEmpty()) ) {
  • router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java

    r2557a0b r8eb7cf7  
    7979        }
    8080
     81        // TODO only look up once, then check type
    8182        LeaseSet ls = getContext().netDb().lookupLeaseSetLocally(_message.getSearchKey());
    8283        if (ls != null) {
Note: See TracChangeset for help on using the changeset viewer.