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

propagate from branch 'i2p.i2p.zzz.ecdsa' (head 1dd9522809f801ca68dd331cfba1c5c914dc1481)

Browse Source 
to branch 'i2p.i2p' (head a1c2ba4663abc7470f427c6a14854707d58b486a)


 Prop from branch i2p.i2p.zzz.ecdsa:
 * Build:
   - Generate su3 file in release target
   - Add zzz's new RSA 4096 pubkey cert for updates
   - Fix checkcerts.sh
 * Console: Move advanced setting to HelperBase
 * DSAEngine changes:
   - Implement raw sign/verify for other SigTypes
   - Add sign/verify methods using Java keys
 * ECDSA Support:
   - Add ECConstants which looks for named curves and falls back to
     explicitly defining the curves
   - Add support for ECDSA to SigType, DSAEngine and KeyGenerator
   - Attempt to add BC as a Provider
   - genSpec: fallback to BC provider
 * EepGet:
   - Fix non-proxied PartialEepGet
   - Prevent non-proxied eepget for an I2P host
 * KeyGenerator changes:
   - Generate key pairs for all supported SigTypes
   - KeyPairGen: Catch ProviderException, fallback to BC provider
   - Add KeyGenerator main() tests
 * KeyRing and DirKeyRing added: simple backend for storing X.509 certs
 * KeyStoreUtil added:
   - Consolidate KeyStore code from SSLEepGet, I2CPSSLSocketFactory,
     SSLClientListenerRunner, and RouterConsoleRunner into new
     KeyStoreUtil and CertUtil classes in net.i2p.crypto (ticket #744)
   - Change default to RSA 2048 (ticket #1017)
   - Set file modes on written keys
   - Overwrite check in createKeys()
   - New getCert(), getKey()
   - Extend keygen max wait
   - Read back private key to verify after keygen
   - Validate cert after reading from file
   - Validate CN in cert
   - Specify cert signature algorithm when generating keys
 * NativeBigInteger: Tweak to prevent early context instantiation
 * RSA support added: constants, parameters, sig types, support in DSAEngine, KeyGenerator, SigUtil
 * SHA1Hash: Add no-arg constructor
 * SigType changes:
   - Add parameters (curve specs) to SigTypes
   - Add getHashInstance()
   - Add RSA, fix ECDSA
   - Renumber, rename, comment out types that are too short.
 * SigUtil added:
   - Converters from Java formats (ASN.1, X.509, PKCS#8)
     to I2P formats for Signatures and SigningKeys
   - Move ASN.1 converter from DSAEngine to SigUtil, generalize
     for variable length, add support for longer sequences,
     add more sanity checks, add more exceptions
   - Move I2P-to-Java DSA key conversion from DSAEngine to SigUtil
   - Add Java-to-I2P DSA key conversion
   - Add Java key import
   - New split() and combine() methods
 * SSLEepGet: Move all certificates to certificates/ssl, in preparation
   for other certificate uses by SU3File
 * SU3File changes:
   - Support all SigTypes
   - Implement keygen
   - Readahead to get sigtype on verify, as we need the hash type
   - Enum for content type
   - Add unknown content type, make default
   - Fix NPE if private key not found or sign fails
   - Store generated keys in keystore, and get private key from keystore
     for signing, in Java format
   - Use Java keys to sign and verify so we don't
     lose the key parameters in the conversion to I2P keys
   - Type checking of Java private key vs. type when signing
   - Use certs instead of public keys for verification
   - Fix arg processing
   - Improve validate-without-extract
   - New extract command
   - Change static fields to avoid early context init
   - Reduce PRNG buffer size for faster signing
 * Update: Preliminary work for su3 router updates:
   - New ROUTER_SIGNED_SU3 UpdateType
   - Add support for torrent and HTTP
   - Refactor UpdateRunners to return actual UpdateType
   - Deal with signed/su3 conflicts
   - Verify and extract su3 files.
   - Stub out support for clearnet su3 updating
   - New config for proxying news, separate from proxying update
   - PartialEepGet and SSLEepGet tweaks to support clearnet update
   - Remove proxy, key, and url config from /configupdate
   - More URI checks in UpdateRunner
   - Add https support for news fetch
   - Add su3 mime type
   - Reset found version in update loop so we don't fetch from
     the next host too.
   - Prevent NPE on version after SSL fetch
This commit is contained in:
zzz
2013-10-06 17:09:56 +00:00
parent 82b1eb7c18 a1c8e3eae3
commit 6bb1505d3b
81 changed files with 15829 additions and 16086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/i2psnark/java/build.xml
View File

@@ -130,6 +130,7 @@
<!-- Update the messages_*.po files.
We need to supply the bat file for windows, and then change the fail property to true -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
<env key="JAVA_HOME" value="${java.home}" />
<arg value="./bundle-messages.sh" />
</exec>
<exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >

4
apps/i2psnark/java/bundle-messages.sh
View File

@@ -15,6 +15,10 @@ TMPFILE=build/javafiles.txt
export TZ=UTC
RC=0
if ! $(which javac > /dev/null 2>&1); then
export JAVAC=${JAVA_HOME}/../bin/javac
fi
if [ "$1" = "-p" ]
then
POUPDATE=1

2
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -128,7 +128,7 @@ public class SnarkManager implements CompleteListener {
,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
,"Diftracker", "http://diftracker.i2p/announce.php=http://diftracker.i2p/"
// , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
// ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
};
/** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */

8
apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java
View File

@@ -113,7 +113,7 @@ class UpdateRunner implements UpdateTask, CompleteListener {
}
_snark = _smgr.addMagnet(name, ih, trackerURL, true, true, this);
if (_snark != null) {
updateStatus("<b>" + _smgr.util().getString("Updating from {0}", updateURL) + "</b>");
updateStatus("<b>" + _smgr.util().getString("Updating from {0}", linkify(updateURL)) + "</b>");
new Timeout();
break;
}
@@ -293,6 +293,12 @@ class UpdateRunner implements UpdateTask, CompleteListener {
//////// end CompleteListener methods
private static String linkify(String url) {
String durl = url.length() <= 28 ? url :
url.substring(0, 25) + "&hellip;";
return "<a target=\"_blank\" href=\"" + url + "\"/>" + durl + "</a>";
}
private void updateStatus(String s) {
_umgr.notifyProgress(this, s);
}

36
apps/i2psnark/locale/messages_de.po
View File

@@ -6,20 +6,21 @@
# Translators:
# "blabla", 2011
# blabla <blabla@trash-mail.com>, 2012
# D.A. Loader <>, 2012
# D.A. Loader, 2012
# ducki2p <ducki2p@gmail.com>, 2011
# foo <foo@bar>, 2009
# SteinQuadrat, 2013
# mixxy, 2011
# nextloop <ga25day@mytum.de>, 2013
# pirr <pirr@tormail.org>, 2012
# zeroflag <zeroflag@i2pmail.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-02 17:23+0000\n"
"PO-Revision-Date: 2013-06-27 13:09+0000\n"
"Last-Translator: SteinQuadrat\n"
"POT-Creation-Date: 2013-09-26 21:33+0000\n"
"PO-Revision-Date: 2013-09-23 22:30+0000\n"
"Last-Translator: nextloop <ga25day@mytum.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/"
"de/)\n"
"Language: de\n"
@@ -426,16 +427,16 @@ msgstr "I2P Tunnel öffnen ..."
msgid "Opening the I2P tunnel and starting all torrents."
msgstr "Öffne den I2P-Tunnel und starte alle Torrents ..."
#: ../java/src/org/klomp/snark/SnarkManager.java:1903
#: ../java/src/org/klomp/snark/SnarkManager.java:1911
msgid "Stopping all torrents and closing the I2P tunnel."
msgstr "Stoppe alle Torrents und beende den I2P-Tunnel."
#: ../java/src/org/klomp/snark/SnarkManager.java:1922
#: ../java/src/org/klomp/snark/SnarkManager.java:1930
msgid "Closing I2P tunnel after notifying trackers."
msgstr "Der I2P-Tunnel wird nach Benachrichtigung der Tracker geschlossen."
#: ../java/src/org/klomp/snark/SnarkManager.java:1929
#: ../java/src/org/klomp/snark/SnarkManager.java:1940
#: ../java/src/org/klomp/snark/SnarkManager.java:1937
#: ../java/src/org/klomp/snark/SnarkManager.java:1948
msgid "I2P tunnel closed."
msgstr "I2P-Tunnel geschlossen."
@@ -600,9 +601,8 @@ msgid "Stop All"
msgstr "Stoppe alle"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515
#, fuzzy
msgid "Start all stopped torrents"
msgstr "Torrent starten"
msgstr "Alle angehaltenen Torrents fortsetzen"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531
@@ -1159,7 +1159,7 @@ msgid "Website URL"
msgstr "Webseiten-URL"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2567
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566
msgid "Open"
msgstr "offen"
@@ -1209,15 +1209,15 @@ msgstr "Tracker Liste"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2356
msgid "Comment"
msgstr ""
msgstr "Kommentar"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2365
msgid "Created"
msgstr ""
msgstr "Erstellt"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2375
msgid "Created By"
msgstr ""
msgstr "Erstellt von"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2385
msgid "Magnet link"
@@ -1283,18 +1283,18 @@ msgstr "vollständig"
msgid "remaining"
msgstr "verbleibend"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2592
msgid "High"
msgstr "hoch"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2597
msgid "Normal"
msgstr "normal"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2602
msgid "Skip"
msgstr "auslassen"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2613
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
msgid "Save priorities"
msgstr "Prioritäten speichern"

12
apps/i2psnark/locale/messages_en.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2psnark\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-11 14:23+0000\n"
"POT-Creation-Date: 2013-09-20 10:46+0000\n"
"PO-Revision-Date: 2010-06-15 14:09+0100\n"
"Last-Translator: duck <duck@mail.i2p>\n"
"Language-Team: duck <duck@mail.i2p>\n"
@@ -1100,7 +1100,7 @@ msgid "Website URL"
msgstr ""
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2567
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566
msgid "Open"
msgstr ""
@@ -1224,18 +1224,18 @@ msgstr ""
msgid "remaining"
msgstr ""
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2592
msgid "High"
msgstr ""
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2597
msgid "Normal"
msgstr ""
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2602
msgid "Skip"
msgstr ""
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2613
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
msgid "Save priorities"
msgstr ""

12
apps/i2psnark/locale/messages_fr.po
View File

@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-11 14:29+0000\n"
"POT-Creation-Date: 2013-09-20 10:24+0000\n"
"PO-Revision-Date: 2013-07-16 15:32+0000\n"
"Last-Translator: Boxoa590\n"
"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
@@ -1152,7 +1152,7 @@ msgid "Website URL"
msgstr "URL du site web"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2567
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566
msgid "Open"
msgstr "Ouvrir le fichier"
@@ -1276,18 +1276,18 @@ msgstr "complet"
msgid "remaining"
msgstr "restant"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2592
msgid "High"
msgstr "Haut"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2597
msgid "Normal"
msgstr "Normal"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2602
msgid "Skip"
msgstr "Ignorer"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2613
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
msgid "Save priorities"
msgstr "Sauvegarder les priorités"

12
apps/i2psnark/locale/messages_ru.po
View File

@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-11 14:27+0000\n"
"POT-Creation-Date: 2013-09-20 10:16+0000\n"
"PO-Revision-Date: 2013-07-12 16:38+0000\n"
"Last-Translator: varnav\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/"
@@ -1155,7 +1155,7 @@ msgid "Website URL"
msgstr "URL сайта"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2016
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2567
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566
msgid "Open"
msgstr "Открыть"
@@ -1281,18 +1281,18 @@ msgstr "скачано"
msgid "remaining"
msgstr "осталось"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2594
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2592
msgid "High"
msgstr "Высокий"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2599
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2597
msgid "Normal"
msgstr "Нормальный"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2604
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2602
msgid "Skip"
msgstr "Пропустить"
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2613
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2611
msgid "Save priorities"
msgstr "Сохранить приоритеты"

742
apps/i2psnark/locale/messages_sv.po
View File

File diff suppressed because it is too large Load Diff