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

LS2: Allow UTF-8 for blinding secret

Browse Source
This commit is contained in:
zzz
2019-03-10 12:11:13 +00:00
parent e36a3b318a
commit 30dbe24777
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/src/net/i2p/crypto/Blinding.java
View File

@ -148,9 +148,10 @@ public final class Blinding {
byte[] mod = DataHelper.getASCII(modVal);
byte[] data;
if (secret != null && secret.length() > 0) {
data = new byte[LENGTH + secret.length()];
byte[] sb = DataHelper.getUTF8(secret);
data = new byte[LENGTH + sb.length];
System.arraycopy(mod, 0, data, 0, LENGTH);
System.arraycopy(DataHelper.getASCII(secret), 0, data, LENGTH, secret.length());
System.arraycopy(sb, 0, data, LENGTH, sb.length);
} else {
data = mod;
}
@ -166,6 +167,12 @@ public final class Blinding {
Hash salt = ctx.sha().calculateHash(in);
hkdf.calculate(salt.getData(), data, INFO, out, out, 32);
byte[] b = EdDSABlinding.reduce(out);
//net.i2p.util.Log log = ctx.logManager().getLog(Blinding.class);
//log.debug("Input to salt sha256:\n" + net.i2p.util.HexDump.dump(in));
//log.debug("salt:\n" + net.i2p.util.HexDump.dump(salt.getData()));
//log.debug("data:\n" + net.i2p.util.HexDump.dump(data));
//log.debug("hkdf output (seed):\n" + net.i2p.util.HexDump.dump(out));
//log.debug("alpha (seed mod l):\n" + net.i2p.util.HexDump.dump(b));
return new SigningPrivateKey(TYPER, b);
}

2
core/java/src/net/i2p/crypto/eddsa/EdDSABlinding.java
View File

@ -94,7 +94,7 @@ public final class EdDSABlinding {
*/
public static byte[] reduce(byte[] b) {
if (b.length != 64)
throw new IllegalArgumentException();
throw new IllegalArgumentException("Must be 64 bytes");
ScalarOps sc = new BigIntegerScalarOps(FIELD, ORDER);
return sc.reduce(b);
}