forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.ecdsa' (head 1dd9522809f801ca68dd331cfba1c5c914dc1481)
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:
@@ -121,6 +121,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}" >
|
||||
@@ -167,6 +168,7 @@
|
||||
|
||||
<target name="bundle-news" unless="no.bundle">
|
||||
<exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
|
||||
<env key="JAVA_HOME" value="${java.home}" />
|
||||
<arg value="./bundle-messages-news.sh" />
|
||||
</exec>
|
||||
<exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
|
||||
|
||||
@@ -15,6 +15,10 @@ TMPFILE=build/javafiles-news.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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -47,7 +47,8 @@ public class HomeHelper extends HelperBase {
|
||||
"Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S +
|
||||
_x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S +
|
||||
//_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S +
|
||||
_x("killyourtv.i2p") + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "eepsite.png" + S +
|
||||
"killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "eepsite.png" + S +
|
||||
"open4you.i2p" + S + S + "http://open4you.i2p/" + S + I + "eepsite.png" + S +
|
||||
_x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "eepsite.png" + S +
|
||||
"Planet I2P" + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "eepsite.png" + S +
|
||||
_x("Plugins") + S + _x("Add-on directory") + S + "http://plugins.i2p/" + S + I + "plugin.png" + S +
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package net.i2p.router.web;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import net.i2p.data.DataHelper;
|
||||
import net.i2p.data.RouterAddress;
|
||||
import net.i2p.data.RouterInfo;
|
||||
import net.i2p.data.Signature;
|
||||
|
||||
/**
|
||||
* Sign a statement about this router.
|
||||
* @since 0.9.8
|
||||
*/
|
||||
public class ProofHelper extends HelperBase {
|
||||
|
||||
public String getProof() {
|
||||
StringBuilder buf = new StringBuilder(512);
|
||||
RouterInfo us = _context.router().getRouterInfo();
|
||||
buf.append("Hash: ").append(us.getIdentity().calculateHash().toBase64()).append('\n');
|
||||
//buf.append("Ident: ").append(us.getIdentity().toBase64()).append('\n');
|
||||
for (RouterAddress addr : us.getAddresses()) {
|
||||
buf.append(addr.getTransportStyle()).append(": ").append(addr.getHost()).append('\n');
|
||||
}
|
||||
buf.append("Caps: ").append(us.getCapabilities()).append('\n');
|
||||
buf.append("Date: ").append(new Date()); // no trailing newline
|
||||
String msg = buf.toString();
|
||||
byte[] data = DataHelper.getUTF8(msg);
|
||||
Signature sig = _context.dsa().sign(data, _context.keyManager().getSigningPrivateKey());
|
||||
buf.setLength(0);
|
||||
buf.append("---BEGIN I2P SIGNED MESSAGE---\n");
|
||||
buf.append(msg);
|
||||
buf.append("\n---BEGIN I2P SIGNATURE---\n");
|
||||
buf.append(sig.toBase64());
|
||||
buf.append("\n---END I2P SIGNATURE---");
|
||||
return buf.toString();
|
||||
}
|
||||
}
|
||||
16
apps/routerconsole/jsp/proof.jsp
Normal file
16
apps/routerconsole/jsp/proof.jsp
Normal file
@@ -0,0 +1,16 @@
|
||||
<%@page contentType="text/html"%>
|
||||
<%@page pageEncoding="UTF-8"%>
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
|
||||
<html><head>
|
||||
<%@include file="css.jsi" %>
|
||||
<%=intl.title("Proof")%>
|
||||
<script src="/js/ajax.js" type="text/javascript"></script>
|
||||
<%@include file="summaryajax.jsi" %>
|
||||
</head><body onload="initAjax()">
|
||||
<%@include file="summary.jsi" %><h1>Proof of Ownership</h1>
|
||||
<div class="main" id="main">
|
||||
<jsp:useBean class="net.i2p.router.web.ProofHelper" id="proofHelper" scope="request" />
|
||||
<jsp:setProperty name="proofHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
|
||||
<textarea cols="70" rows="15" wrap="off" readonly="readonly" spellcheck="false"><jsp:getProperty name="proofHelper" property="proof" /></textarea>
|
||||
</div></body></html>
|
||||
@@ -3,13 +3,15 @@
|
||||
# This file is distributed under the same license as the routerconsole package.
|
||||
# To contribute translations, see http://www.i2p2.de/newdevelopers
|
||||
#
|
||||
# Translators:
|
||||
# Ashoka <martin2p@posteo.de>, 2013
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-07-13 21:46+0000\n"
|
||||
"PO-Revision-Date: 2013-05-08 15:06+0000\n"
|
||||
"Last-Translator: zeroflag <zeroflag@i2pmail.org>\n"
|
||||
"POT-Creation-Date: 2013-09-20 10:25+0000\n"
|
||||
"PO-Revision-Date: 2013-09-16 07:09+0000\n"
|
||||
"Last-Translator: Ashoka <martin2p@posteo.de>\n"
|
||||
"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/"
|
||||
"de/)\n"
|
||||
"Language: de\n"
|
||||
@@ -26,39 +28,51 @@ msgstr "Willkommen im I2P!"
|
||||
|
||||
#, java-format
|
||||
msgid "Please {0}have patience{1} as I2P boots up and finds peers."
|
||||
msgstr "Hab noch {0}etwas Geduld{1}, während I2P startet und weitere I2P-Router findet."
|
||||
msgstr ""
|
||||
"Hab noch {0}etwas Geduld{1}, während I2P startet und weitere I2P-Router "
|
||||
"findet."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}"
|
||||
"configuration page{3}."
|
||||
msgstr "Passe bitte in der Zwischenzeit {0}deine Einstellungen zur Bandbreite{1} auf der"
|
||||
"{2}Einstellungsseite{3} an!"
|
||||
msgstr ""
|
||||
"Passe bitte in der Zwischenzeit {0}deine Einstellungen zur Bandbreite{1} auf "
|
||||
"der{2}Einstellungsseite{3} an!"
|
||||
|
||||
msgid "Also you can setup your browser to use the I2P proxy to reach eepsites."
|
||||
msgstr "Auch kannst Du gleich deinen Browser für die Nutzung von I2P einrichten."
|
||||
msgstr ""
|
||||
"Auch kannst Du gleich deinen Browser für die Nutzung von I2P einrichten."
|
||||
|
||||
msgid ""
|
||||
"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
|
||||
"browser settings."
|
||||
msgstr "Setze in den Einstellungen zum Browser ein HTTP Proxy ein mit 127.0.0.1 (oder localhost) mit Port 4444 als Ziel."
|
||||
msgstr ""
|
||||
"Setze in den Einstellungen zum Browser ein HTTP Proxy ein mit 127.0.0.1 "
|
||||
"(oder localhost) mit Port 4444 als Ziel."
|
||||
|
||||
msgid "Do not use SOCKS for this."
|
||||
msgstr ""
|
||||
msgstr "Benutze keine SOCKS dafür."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"More information can be found on the {0}I2P browser proxy setup page{1}."
|
||||
msgstr "Mehr Informationen gibt es auf der {0}I2P browser proxy Setup Seite{1}."
|
||||
msgstr ""
|
||||
"Mehr Informationen gibt es auf der {0}I2P browser proxy Setup Seite{1}."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"Once you have a \"shared clients\" destination listed on the left, please {0}"
|
||||
"check out{1} our {2}FAQ{3}."
|
||||
msgstr "Sobald auf der linken Seite eine Verbindung namens \"versch. Klienten\" aufgelistet ist, kannst Du unsere {0}{1} {2}FAQ{3} besuchen."
|
||||
msgstr ""
|
||||
"Sobald auf der linken Seite eine Verbindung namens \"versch. Klienten\" "
|
||||
"aufgelistet ist, kannst Du unsere {0}{1} {2}FAQ{3} besuchen."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-"
|
||||
"help{3} or {4}#i2p{5}."
|
||||
msgstr "Verbinde deinen IRC-Klienten mit dem Server auf {0}localhost:6668{1} und schau bei uns im Kanal <a href=\"irc://127.0.0.1:6668/i2p-de\">#i2p-de</a>, {2}#i2p-help{3} oder {4}#i2p{5} vorbei!"
|
||||
msgstr ""
|
||||
"Verbinde deinen IRC-Klienten mit dem Server auf {0}localhost:6668{1} und "
|
||||
"schau bei uns im Kanal <a href=\"irc://127.0.0.1:6668/i2p-de\">#i2p-de</a>, "
|
||||
"{2}#i2p-help{3} oder {4}#i2p{5} vorbei!"
|
||||
|
||||
@@ -4,15 +4,16 @@
|
||||
# To contribute translations, see http://www.i2p2.de/newdevelopers
|
||||
#
|
||||
# Translators:
|
||||
# Boxoa590, 2013
|
||||
# foo <foo@bar>, 2009
|
||||
# Boxoa590, 2013
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-08-11 15:43+0000\n"
|
||||
"PO-Revision-Date: 2013-07-22 20:37+0000\n"
|
||||
"Last-Translator: Boxoa590\n"
|
||||
"POT-Creation-Date: 2013-09-20 10:24+0000\n"
|
||||
"PO-Revision-Date: 2013-08-11 15:50+0000\n"
|
||||
"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
|
||||
"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
|
||||
"fr/)\n"
|
||||
"Language: fr\n"
|
||||
|
||||
@@ -3,13 +3,16 @@
|
||||
# This file is distributed under the same license as the routerconsole package.
|
||||
# To contribute translations, see http://www.i2p2.de/newdevelopers
|
||||
#
|
||||
# Translators:
|
||||
# hottuna <i2p@robertfoss.se>, 2013
|
||||
# hottuna <i2p@robertfoss.se>, 2013
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: I2P\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-07-13 21:46+0000\n"
|
||||
"PO-Revision-Date: 2013-01-03 09:01+0000\n"
|
||||
"Last-Translator: mon <mattias.ohlsson@inprose.com>\n"
|
||||
"POT-Creation-Date: 2013-09-26 21:42+0000\n"
|
||||
"PO-Revision-Date: 2013-09-26 06:40+0000\n"
|
||||
"Last-Translator: hottuna <i2p@robertfoss.se>\n"
|
||||
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/"
|
||||
"language/sv_SE/)\n"
|
||||
"Language: sv_SE\n"
|
||||
@@ -19,7 +22,7 @@ msgstr ""
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
msgid "Congratulations on getting I2P installed!"
|
||||
msgstr ""
|
||||
msgstr "Grattis för din I2P installation!"
|
||||
|
||||
msgid "Welcome to I2P!"
|
||||
msgstr "Välkommen till I2P!"
|
||||
@@ -32,32 +35,43 @@ msgstr "{0}Ha tålamod{1} medan I2P startar upp och letar upp peers."
|
||||
msgid ""
|
||||
"While you are waiting, please {0}adjust your bandwidth settings{1} on the {2}"
|
||||
"configuration page{3}."
|
||||
msgstr "Medan du väntar, var god {0}ställ in dina bandbreddd och port inställningar{1} på {2}konfigurations-sidan{3}."
|
||||
msgstr ""
|
||||
"Medan du väntar, var god {0}ställ in dina bandbreddd och port "
|
||||
"inställningar{1} på {2}konfigurations-sidan{3}."
|
||||
|
||||
msgid "Also you can setup your browser to use the I2P proxy to reach eepsites."
|
||||
msgstr ""
|
||||
"Du kan även ställa in din webbläsare till att använda I2P-proxyn för att nå "
|
||||
"eepsidor."
|
||||
|
||||
msgid ""
|
||||
"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
|
||||
"browser settings."
|
||||
msgstr ""
|
||||
"Skriv in 127.0.0.1 (eller localhost) port 4444 som en http-proxy i din "
|
||||
"webbläsares inställningar."
|
||||
|
||||
msgid "Do not use SOCKS for this."
|
||||
msgstr ""
|
||||
msgstr "Använd inte SOCKS för detta."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"More information can be found on the {0}I2P browser proxy setup page{1}."
|
||||
msgstr ""
|
||||
"Mer information kan hittsa på {0}I2P webbläsar-proxy inställnings sidan{1}."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"Once you have a \"shared clients\" destination listed on the left, please {0}"
|
||||
"check out{1} our {2}FAQ{3}."
|
||||
msgstr "När du har en \"delade klienter\" distination listad på vänster sida, {0}kika på{1} vår {2}FAQ{3}."
|
||||
msgstr ""
|
||||
"När du har en \"delade klienter\" distination listad på vänster sida, {0}"
|
||||
"kika på{1} vår {2}FAQ{3}."
|
||||
|
||||
#, java-format
|
||||
msgid ""
|
||||
"Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p-"
|
||||
"help{3} or {4}#i2p{5}."
|
||||
msgstr "Rikta din IRC-klient till {0}localhost:6668{1} och säg hej till oss på {2}#i2p-help{3} eller {4}#i2p{5}."
|
||||
msgstr ""
|
||||
"Rikta din IRC-klient till {0}localhost:6668{1} och säg hej till oss på {2}"
|
||||
"#i2p-help{3} eller {4}#i2p{5}."
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user