Skip to content

Commit 383acf7

Browse files
Lyor Goldsteinstr4d
Lyor Goldstein
authored and
str4d
committed
Updated unit tests to use literal constant for curve name
1 parent abdee14 commit 383acf7

File tree

7 files changed

+42
-48
lines changed

7 files changed

+42
-48
lines changed

‎test/net/i2p/crypto/eddsa/EdDSAEngineTest.java‎

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
*/
1212
package net.i2p.crypto.eddsa;
1313

14-
import static org.hamcrest.Matchers.*;
15-
import static org.junit.Assert.*;
14+
import static org.hamcrest.Matchers.equalTo;
15+
import static org.hamcrest.Matchers.is;
16+
import static org.junit.Assert.assertThat;
1617

1718
import java.nio.charset.Charset;
1819
import java.security.MessageDigest;
@@ -45,9 +46,9 @@ public class EdDSAEngineTest {
4546

4647
@Test
4748
public void testSign() throws Exception {
49+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
4850
//Signature sgr = Signature.getInstance("EdDSA", "I2P");
49-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
50-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
51+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
5152

5253
for (Ed25519TestVectors.TestTuple testCase : Ed25519TestVectors.testCases) {
5354
EdDSAPrivateKeySpec privKey = new EdDSAPrivateKeySpec(testCase.seed, spec);
@@ -63,10 +64,9 @@ public void testSign() throws Exception {
6364

6465
@Test
6566
public void testVerify() throws Exception {
67+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
6668
//Signature sgr = Signature.getInstance("EdDSA", "I2P");
67-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
68-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
69-
69+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
7070
for (Ed25519TestVectors.TestTuple testCase : Ed25519TestVectors.testCases) {
7171
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(testCase.pk, spec);
7272
PublicKey vKey = new EdDSAPublicKey(pubKey);
@@ -84,11 +84,10 @@ public void testVerify() throws Exception {
8484
*/
8585
@Test
8686
public void testVerifyWrongSigLength() throws Exception {
87+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
8788
//Signature sgr = Signature.getInstance("EdDSA", "I2P");
88-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
89-
90-
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK,
91-
EdDSANamedCurveTable.getByName("ed25519-sha-512"));
89+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
90+
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK, spec);
9291
PublicKey vKey = new EdDSAPublicKey(pubKey);
9392
sgr.initVerify(vKey);
9493

@@ -101,9 +100,8 @@ public void testVerifyWrongSigLength() throws Exception {
101100

102101
@Test
103102
public void testSignResetsForReuse() throws Exception {
104-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
105-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
106-
103+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
104+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
107105
EdDSAPrivateKeySpec privKey = new EdDSAPrivateKeySpec(TEST_SEED, spec);
108106
PrivateKey sKey = new EdDSAPrivateKey(privKey);
109107
sgr.initSign(sKey);
@@ -119,10 +117,9 @@ public void testSignResetsForReuse() throws Exception {
119117

120118
@Test
121119
public void testVerifyResetsForReuse() throws Exception {
122-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
123-
124-
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK,
125-
EdDSANamedCurveTable.getByName("ed25519-sha-512"));
120+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
121+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
122+
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK, spec);
126123
PublicKey vKey = new EdDSAPublicKey(pubKey);
127124
sgr.initVerify(vKey);
128125

@@ -137,9 +134,8 @@ public void testVerifyResetsForReuse() throws Exception {
137134

138135
@Test
139136
public void testSignOneShotMode() throws Exception {
140-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
141-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
142-
137+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
138+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
143139
EdDSAPrivateKeySpec privKey = new EdDSAPrivateKeySpec(TEST_SEED, spec);
144140
PrivateKey sKey = new EdDSAPrivateKey(privKey);
145141
sgr.initSign(sKey);
@@ -152,10 +148,9 @@ public void testSignOneShotMode() throws Exception {
152148

153149
@Test
154150
public void testVerifyOneShotMode() throws Exception {
155-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
156-
157-
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK,
158-
EdDSANamedCurveTable.getByName("ed25519-sha-512"));
151+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
152+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
153+
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK, spec);
159154
PublicKey vKey = new EdDSAPublicKey(pubKey);
160155
sgr.initVerify(vKey);
161156
sgr.setParameter(EdDSAEngine.ONE_SHOT_MODE);
@@ -167,9 +162,8 @@ public void testVerifyOneShotMode() throws Exception {
167162

168163
@Test
169164
public void testSignOneShotModeMultipleUpdates() throws Exception {
170-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
171-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
172-
165+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
166+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
173167
EdDSAPrivateKeySpec privKey = new EdDSAPrivateKeySpec(TEST_SEED, spec);
174168
PrivateKey sKey = new EdDSAPrivateKey(privKey);
175169
sgr.initSign(sKey);
@@ -184,10 +178,9 @@ public void testSignOneShotModeMultipleUpdates() throws Exception {
184178

185179
@Test
186180
public void testVerifyOneShotModeMultipleUpdates() throws Exception {
187-
Signature sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
188-
189-
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK,
190-
EdDSANamedCurveTable.getByName("ed25519-sha-512"));
181+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
182+
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK, spec);
183+
Signature sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
191184
PublicKey vKey = new EdDSAPublicKey(pubKey);
192185
sgr.initVerify(vKey);
193186
sgr.setParameter(EdDSAEngine.ONE_SHOT_MODE);
@@ -201,10 +194,9 @@ public void testVerifyOneShotModeMultipleUpdates() throws Exception {
201194

202195
@Test
203196
public void testSignOneShot() throws Exception {
204-
EdDSAEngine sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
205-
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName("ed25519-sha-512");
206-
197+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
207198
EdDSAPrivateKeySpec privKey = new EdDSAPrivateKeySpec(TEST_SEED, spec);
199+
EdDSAEngine sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
208200
PrivateKey sKey = new EdDSAPrivateKey(privKey);
209201
sgr.initSign(sKey);
210202

@@ -213,10 +205,9 @@ public void testSignOneShot() throws Exception {
213205

214206
@Test
215207
public void testVerifyOneShot() throws Exception {
216-
EdDSAEngine sgr = new EdDSAEngine(MessageDigest.getInstance("SHA-512"));
217-
218-
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK,
219-
EdDSANamedCurveTable.getByName("ed25519-sha-512"));
208+
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
209+
EdDSAPublicKeySpec pubKey = new EdDSAPublicKeySpec(TEST_PK, spec);
210+
EdDSAEngine sgr = new EdDSAEngine(MessageDigest.getInstance(spec.getHashAlgorithm()));
220211
PublicKey vKey = new EdDSAPublicKey(pubKey);
221212
sgr.initVerify(vKey);
222213

‎test/net/i2p/crypto/eddsa/math/ConstantsTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
*/
1212
package net.i2p.crypto.eddsa.math;
1313

14-
import static org.hamcrest.Matchers.*;
15-
import static org.junit.Assert.*;
14+
import static org.hamcrest.Matchers.equalTo;
15+
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
16+
import static org.hamcrest.Matchers.is;
17+
import static org.junit.Assert.assertThat;
18+
import static org.junit.Assert.fail;
1619

1720
import java.security.MessageDigest;
1821
import java.security.NoSuchAlgorithmException;
@@ -28,7 +31,7 @@
2831
*
2932
*/
3033
public class ConstantsTest {
31-
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
34+
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3235
static final Curve curve = ed25519.getCurve();
3336

3437
static final FieldElement ZERO = curve.getField().ZERO;

‎test/net/i2p/crypto/eddsa/math/GroupElementTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class GroupElementTest {
3434
static final byte[] BYTES_TENZERO = Utils.hexToBytes("0000000000000000000000000000000000000000000000000000000000000000");
3535
static final byte[] BYTES_ONETEN = Utils.hexToBytes("0a00000000000000000000000000000000000000000000000000000000000080");
3636

37-
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
37+
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3838
static final Curve curve = ed25519.getCurve();
3939

4040
static final FieldElement ZERO = curve.getField().ZERO;

‎test/net/i2p/crypto/eddsa/math/MathUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class MathUtils {
2727
private static final int[] exponents = {0, 26, 26 + 25, 2*26 + 25, 2*26 + 2*25, 3*26 + 2*25, 3*26 + 3*25, 4*26 + 3*25, 4*26 + 4*25, 5*26 + 4*25};
2828
private static final SecureRandom random = new SecureRandom();
29-
private static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
29+
private static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3030
private static final Curve curve = ed25519.getCurve();
3131
private static final BigInteger d = new BigInteger("-121665").multiply(new BigInteger("121666").modInverse(getQ()));
3232
private static final BigInteger groupOrder = BigInteger.ONE.shiftLeft(252).add(new BigInteger("27742317777372353535851937790883648493"));

‎test/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class PrecomputationTestVectors {
2727
static GroupElement[] testDblPrecmp = getDoublePrecomputation("baseDblPrecmp");
2828

2929
public static GroupElement[][] getPrecomputation(String fileName) {
30-
EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
30+
EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3131
Curve curve = ed25519.getCurve();
3232
Field field = curve.getField();
3333
GroupElement[][] precmp = new GroupElement[32][8];
@@ -70,7 +70,7 @@ else if (line.equals("},")) {
7070
}
7171

7272
public static GroupElement[] getDoublePrecomputation(String fileName) {
73-
EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
73+
EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
7474
Curve curve = ed25519.getCurve();
7575
Field field = curve.getField();
7676
GroupElement[] dblPrecmp = new GroupElement[8];

‎test/net/i2p/crypto/eddsa/math/bigint/BigIntegerScalarOpsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public class BigIntegerScalarOpsTest {
3232

33-
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
33+
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3434
static final Field ed25519Field = ed25519.getCurve().getField();
3535

3636
/**

‎test/net/i2p/crypto/eddsa/spec/EdDSAPrivateKeySpecTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class EdDSAPrivateKeySpecTest {
2626
static final byte[] ZERO_H = Utils.hexToBytes("5046adc1dba838867b2bbbfdd0c3423e58b57970b5267a90f57960924a87f1960a6a85eaa642dac835424b5d7c8d637c00408c7a73da672b7f498521420b6dd3");
2727
static final byte[] ZERO_PK = Utils.hexToBytes("3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29");
2828

29-
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName("ed25519-sha-512");
29+
static final EdDSANamedCurveSpec ed25519 = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
3030

3131
/**
3232
* Test method for {@link net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec#EdDSAPrivateKeySpec(byte[], net.i2p.crypto.eddsa.spec.EdDSAParameterSpec)}.

0 commit comments

Comments
 (0)