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

Consolidate I2CP property definitions

Browse Source
This commit is contained in:
zzz
2019-11-13 18:06:35 +00:00
parent 65b3cdbb12
commit b8ed77da9a
8 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
router/java/src/net/i2p/router/client/ClientMessageEventListener.java
View File

@ -12,6 +12,7 @@ import java.util.List;
import java.util.Properties;
import net.i2p.CoreVersion;
import net.i2p.client.I2PClient;
import net.i2p.crypto.EncType;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
@ -384,8 +385,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
String user = null;
String pw = null;
if (props != null) {
user = props.getProperty("i2cp.username");
pw = props.getProperty("i2cp.password");
user = props.getProperty(I2PClient.PROP_USER);
pw = props.getProperty(I2PClient.PROP_PW);
}
if (user == null || user.length() == 0 || pw == null || pw.length() == 0) {
_log.logAlways(Log.WARN, "I2CP authentication failed");

5
router/java/src/net/i2p/router/util/RouterPasswordManager.java
View File

@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.i2p.client.I2PClient;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.data.SessionKey;
@ -23,8 +24,8 @@ public class RouterPasswordManager extends PasswordManager {
private static final String PROP_MIGRATED = "router.passwordManager.migrated";
// migrate these to hash
private static final String PROP_I2CP_OLD_PW = "i2cp.password";
private static final String PROP_I2CP_OLD_USER = "i2cp.username";
private static final String PROP_I2CP_OLD_PW = I2PClient.PROP_PW;
private static final String PROP_I2CP_OLD_USER = I2PClient.PROP_USER;
private static final String PROP_I2CP_NEW = "i2cp.auth";
/****
// migrate these to b64