dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-03-29 11:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Console: Mark LS1 encrypted leasesets as deprecated

Browse Source 
also add notes to javadocs for the KeyRing class used to store the keys
This commit is contained in:
zzz
2026-03-13 09:10:16 -04:00
parent 4ebd92445d
commit d5e8cf07bb
7 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/i2ptunnel/jsp/editServer.jsi
View File

@@ -452,8 +452,8 @@
<%
} // mode = 10
%>
<option title="<%=intl._t("Send key to all users.")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : cdisabled)%> >
<%=intl._t("Encrypted")%> (AES)</option>
<option title="<%=intl._t("Send key to all users.")%> <%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : cdisabled)%> >
<%=intl._t("Encrypted")%> (Deprecated LS1 AES)</option>
<%
int curSigType = editBean.getSigType(curTunnel, tunnelType);
boolean allowBlinding = (curSigType == 7 || curSigType == 11);

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java
View File

@@ -94,7 +94,7 @@ public class ConfigKeyringHelper extends HelperBase {
}
buf.append("</td><td>");
if (!local)
buf.append(_t("Encrypted")).append(" (AES)</td><td>");
buf.append(_t("Encrypted")).append(" (Deprecated LS1 AES)</td><td>");
SessionKey sk = e.getValue();
buf.append(sk.toBase64());
if (!local)

2
apps/routerconsole/jsp/configkeyring.jsp
View File

@@ -40,7 +40,7 @@
<td align="right"><b><%=intl._t("Type")%>:</b></td>
<td><select id="encryptMode" name="encryptMode" class="selectbox">
<option title="<%=intl._t("Enter key provided by server operator.")%>" value="1">
<%=intl._t("Encrypted")%> (AES)</option>
<%=intl._t("Encrypted")%> (Deprecated LS1 AES)</option>
<option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2">
<%=intl._t("Blinded")%></option>
<option title="<%=intl._t("Enter password provided by server operator.")%>" value="3">

6
core/java/src/net/i2p/I2PAppContext.java
View File

@@ -864,7 +864,11 @@ public class I2PAppContext {
}
/**
* Basic hash map
* Basic hash map for LS1
*
* Deprecated -
* This is for the deprecated LS1 AES encrypted leasesets only.
* LS2 encrypted leaseset data are stored in netdb BlindCache and router.blindcache.dat.
*/
public KeyRing keyRing() {
if (!_keyRingInitialized)

6
core/java/src/net/i2p/util/KeyRing.java
View File

@@ -9,7 +9,11 @@ import net.i2p.data.Hash;
import net.i2p.data.SessionKey;
/**
* simple
* See net.i2p.router.PersistentKeyRing for extension.
*
* Deprecated -
* This is for the deprecated LS1 AES encrypted leasesets only.
* LS2 encrypted leaseset data are stored in netdb BlindCache and router.blindcache.dat.
*/
public class KeyRing extends ConcurrentHashMap<Hash, SessionKey> {
public KeyRing() {

4
router/java/src/net/i2p/router/PersistentKeyRing.java
View File

@@ -13,6 +13,10 @@ import net.i2p.util.KeyRing;
* ConcurrentHashMap with backing in the router.config file.
* router.keyring.key.{base64 hash, with = replaced with $}={base64 session key}
* Caution - not all HashMap methods are overridden.
*
* Deprecated -
* This is for the deprecated LS1 AES encrypted leasesets only.
* LS2 encrypted leaseset data are stored in netdb BlindCache and router.blindcache.dat.
*/
public class PersistentKeyRing extends KeyRing {

10
router/java/src/net/i2p/router/RouterContext.java
View File

@@ -560,7 +560,15 @@ public class RouterContext extends I2PAppContext {
}
}
/** override to support storage in router.config */
/**
* Basic hash map for LS1
*
* overriden to support storage in router.config
*
* Deprecated -
* This is for the deprecated LS1 AES encrypted leasesets only.
* LS2 encrypted leaseset data are stored in netdb BlindCache and router.blindcache.dat.
*/
@Override
public KeyRing keyRing() {
if (!_keyRingInitialized)