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

i2ptunnel: New b32 error page

Browse Source 
Do basic b32 checks before looking up with session
Util: Fix AIOOBE on bad input to base 32 decode
log tweaks
b33 decode error message tweaks
This commit is contained in:
zzz
2019-09-10 14:21:28 +00:00
parent 479461ab3b
commit b4a5cc07c2
5 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ public final class Blinding {
throw new IllegalArgumentException("Not a .b32.i2p address");
byte[] b = Base32.decode(address.substring(0, address.length() - 8));
if (b == null)
throw new IllegalArgumentException("Bad base32 encoding");
throw new IllegalArgumentException("Corrupt b32 address");
if (b.length < 35)
throw new IllegalArgumentException("Not a new-format address");
return decode(ctx, b);
@ -234,22 +234,22 @@ public final class Blinding {
b[2] ^= (byte) (check >> 16);
int flag = b[0] & 0xff;
if ((flag & 0xf8) != 0)
throw new IllegalArgumentException("Corrupt b32 or unsupported options");
throw new IllegalArgumentException("Corrupt b32 address (or unsupported options)");
if ((flag & FLAG_TWOBYTE) != 0)
throw new IllegalArgumentException("Two byte sig types unsupported");
throw new IllegalArgumentException("Two byte signature types unsupported");
// TODO two-byte sigtypes
int st1 = b[1] & 0xff;
int st2 = b[2] & 0xff;
SigType sigt1 = SigType.getByCode(st1);
SigType sigt2 = SigType.getByCode(st2);
if (sigt1 == null)
throw new IllegalArgumentException("Unknown sig type " + st1);
throw new IllegalArgumentException("Unsupported signature type " + st1);
if (!sigt1.isAvailable())
throw new IllegalArgumentException("Unavailable sig type " + sigt1);
throw new IllegalArgumentException("Unavailable signature type " + sigt1);
if (sigt2 == null)
throw new IllegalArgumentException("Unknown blinded sig type " + st2);
throw new IllegalArgumentException("Unsupported blinded signature type " + st2);
if (!sigt2.isAvailable())
throw new IllegalArgumentException("Unavailable blinded sig type " + sigt2);
throw new IllegalArgumentException("Unavailable blinded signature type " + sigt2);
// todo secret/privkey
int spkLen = sigt1.getPubkeyLen();
if (3 + spkLen > b.length)

2
core/java/src/net/i2p/data/Base32.java
View File

@ -235,6 +235,8 @@ public class Base32 {
fivebits = DECODABET[source[i] - '2'];
if (fivebits >= 0) {
if (outBuffPosn >= len58)
return null;
if (usedbits == 0) {
outBuff[outBuffPosn] = (byte) ((fivebits << 3) & 0xf8);
usedbits = 5;