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

ElG cleanup

Browse Source
This commit is contained in:
zzz
2016-01-29 02:02:34 +00:00
parent 3a72b0cc63
commit 79450bcda6
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPrivateKeyImpl.java
View File

@ -98,10 +98,10 @@ public class ElGamalPrivateKeyImpl
byte[] pb = elSpec.getP().toByteArray(); byte[] pb = elSpec.getP().toByteArray();
byte[] gb = elSpec.getG().toByteArray(); byte[] gb = elSpec.getG().toByteArray();
byte[] xb = x.toByteArray(); byte[] xb = x.toByteArray();
int seq3len = 2 + spaceFor(pb.length) + spaceFor(gb.length); int seq3len = spaceFor(pb.length) + spaceFor(gb.length);
int seq2len = 8 + 1 + spaceFor(seq3len); int seq2len = 8 + spaceFor(seq3len);
int seq1len = 1 + 3 + spaceFor(seq2len) + 1 + spaceFor(xb.length); int seq1len = 3 + spaceFor(seq2len) + spaceFor(xb.length);
int totlen = 1 + spaceFor(seq1len); int totlen = spaceFor(seq1len);
byte[] rv = new byte[totlen]; byte[] rv = new byte[totlen];
int idx = 0; int idx = 0;
// sequence 1 // sequence 1

14
core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPublicKeyImpl.java
View File

@ -82,10 +82,10 @@ public class ElGamalPublicKeyImpl
byte[] pb = elSpec.getP().toByteArray(); byte[] pb = elSpec.getP().toByteArray();
byte[] gb = elSpec.getG().toByteArray(); byte[] gb = elSpec.getG().toByteArray();
byte[] yb = y.toByteArray(); byte[] yb = y.toByteArray();
int seq3len = 2 + spaceFor(pb.length) + spaceFor(gb.length); int seq3len = spaceFor(pb.length) + spaceFor(gb.length);
int seq2len = 8 + 1 + spaceFor(seq3len); int seq2len = 8 + spaceFor(seq3len);
int seq1len = 1 + spaceFor(seq2len) + 1 + spaceFor(yb.length + 1); int seq1len = spaceFor(seq2len) + spaceFor(yb.length + 1);
int totlen = 1 + spaceFor(seq1len); int totlen = spaceFor(seq1len);
byte[] rv = new byte[totlen]; byte[] rv = new byte[totlen];
int idx = 0; int idx = 0;
// sequence 1 // sequence 1
@ -133,6 +133,10 @@ public class ElGamalPublicKeyImpl
return rv; return rv;
} }
/**
* @param val the length of the value, 65535 max
* @return the length of the TLV
*/
static int spaceFor(int val) { static int spaceFor(int val) {
int rv; int rv;
if (val > 255) if (val > 255)
@ -141,7 +145,7 @@ public class ElGamalPublicKeyImpl
rv = 2; rv = 2;
else else
rv = 1; rv = 1;
return rv + val; return 1 + rv + val;
} }
public ElGamalParameterSpec getParameters() public ElGamalParameterSpec getParameters()