Skip to content

Commit 5937853

Browse files
ebourgebourg
committed
Use static import for the DigestAlgorithm values in the tests
1 parent 80fd36b commit 5937853

8 files changed

+62
-58
lines changed

‎jsign-core/src/test/java/net/jsign/MSCabinetSignerTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import net.jsign.mscab.MSCabinetFile;
3232

33+
import static net.jsign.DigestAlgorithm.*;
3334
import static org.junit.Assert.*;
3435

3536
public class MSCabinetSignerTest {
@@ -114,7 +115,7 @@ public void testSignTwice() throws Exception {
114115
MSCabinetFile file = new MSCabinetFile(targetFile);
115116

116117
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
117-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
118+
.withDigestAlgorithm(SHA1)
118119
.withTimestamping(true);
119120

120121
signer.sign(file);
@@ -129,7 +130,7 @@ public void testSignTwice() throws Exception {
129130
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
130131

131132
// second signature
132-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
133+
signer.withDigestAlgorithm(SHA256);
133134
signer.withTimestamping(false);
134135
signer.sign(file);
135136

@@ -153,7 +154,7 @@ public void testSignThreeTimes() throws Exception {
153154
MSCabinetFile file = new MSCabinetFile(targetFile);
154155

155156
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
156-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
157+
.withDigestAlgorithm(SHA1)
157158
.withTimestamping(true);
158159

159160
signer.sign(file);
@@ -168,7 +169,7 @@ public void testSignThreeTimes() throws Exception {
168169
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
169170

170171
// second signature
171-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
172+
signer.withDigestAlgorithm(SHA256);
172173
signer.withTimestamping(false);
173174
signer.sign(file);
174175

@@ -181,7 +182,7 @@ public void testSignThreeTimes() throws Exception {
181182
SignatureAssert.assertTimestamped("Timestamp corrupted after adding the second signature", signatures.get(0));
182183

183184
// third signature
184-
signer.withDigestAlgorithm(DigestAlgorithm.SHA512);
185+
signer.withDigestAlgorithm(SHA512);
185186
signer.withTimestamping(false);
186187
signer.sign(file);
187188

@@ -205,7 +206,7 @@ public void testReplaceSignature() throws Exception {
205206
MSCabinetFile file = new MSCabinetFile(targetFile);
206207

207208
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
208-
.withDigestAlgorithm(DigestAlgorithm.SHA1);
209+
.withDigestAlgorithm(SHA1);
209210

210211
signer.sign(file);
211212

@@ -218,7 +219,7 @@ public void testReplaceSignature() throws Exception {
218219
assertNotNull(signatures.get(0));
219220

220221
// second signature
221-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
222+
signer.withDigestAlgorithm(SHA256);
222223
signer.withTimestamping(false);
223224
signer.withSignaturesReplaced(true);
224225
signer.sign(file);
@@ -231,7 +232,7 @@ public void testReplaceSignature() throws Exception {
231232

232233
assertNotNull(signatures.get(0));
233234

234-
assertEquals("Digest algorithm", DigestAlgorithm.SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
235+
assertEquals("Digest algorithm", SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
235236
}
236237

237238
@Test
@@ -245,7 +246,7 @@ public void testSignInMemory() throws Exception {
245246
MSCabinetFile file = new MSCabinetFile(channel);
246247

247248
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
248-
.withDigestAlgorithm(DigestAlgorithm.SHA512);
249+
.withDigestAlgorithm(SHA512);
249250

250251
signer.sign(file);
251252

‎jsign-core/src/test/java/net/jsign/MSISignerTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import net.jsign.msi.MSIFile;
3030

31+
import static net.jsign.DigestAlgorithm.*;
3132
import static org.junit.Assert.*;
3233

3334
public class MSISignerTest {
@@ -77,7 +78,7 @@ public void testSignTwice() throws Exception {
7778
MSIFile file = new MSIFile(targetFile);
7879

7980
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
80-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
81+
.withDigestAlgorithm(SHA1)
8182
.withTimestamping(true)
8283
.withProgramName("Hello World")
8384
.withProgramURL("http://example.com");
@@ -94,7 +95,7 @@ public void testSignTwice() throws Exception {
9495
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
9596

9697
// second signature
97-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
98+
signer.withDigestAlgorithm(SHA256);
9899
signer.withTimestamping(false);
99100
signer.sign(file);
100101

@@ -118,7 +119,7 @@ public void testSignThreeTimes() throws Exception {
118119
MSIFile file = new MSIFile(targetFile);
119120

120121
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
121-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
122+
.withDigestAlgorithm(SHA1)
122123
.withTimestamping(true)
123124
.withProgramName("Hello World")
124125
.withProgramURL("http://example.com");
@@ -135,7 +136,7 @@ public void testSignThreeTimes() throws Exception {
135136
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
136137

137138
// second signature
138-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
139+
signer.withDigestAlgorithm(SHA256);
139140
signer.withTimestamping(false);
140141
signer.sign(file);
141142

@@ -148,7 +149,7 @@ public void testSignThreeTimes() throws Exception {
148149
SignatureAssert.assertTimestamped("Timestamp corrupted after adding the second signature", signatures.get(0));
149150

150151
// third signature
151-
signer.withDigestAlgorithm(DigestAlgorithm.SHA512);
152+
signer.withDigestAlgorithm(SHA512);
152153
signer.withTimestamping(false);
153154
signer.sign(file);
154155

@@ -172,7 +173,7 @@ public void testReplaceSignature() throws Exception {
172173
MSIFile file = new MSIFile(targetFile);
173174

174175
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
175-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
176+
.withDigestAlgorithm(SHA1)
176177
.withProgramName("Minimal Package")
177178
.withProgramURL("http://example.com");
178179

@@ -187,7 +188,7 @@ public void testReplaceSignature() throws Exception {
187188
assertNotNull(signatures.get(0));
188189

189190
// second signature
190-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
191+
signer.withDigestAlgorithm(SHA256);
191192
signer.withTimestamping(false);
192193
signer.withSignaturesReplaced(true);
193194
signer.sign(file);
@@ -200,7 +201,7 @@ public void testReplaceSignature() throws Exception {
200201

201202
assertNotNull(signatures.get(0));
202203

203-
assertEquals("Digest algorithm", DigestAlgorithm.SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
204+
assertEquals("Digest algorithm", SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
204205
}
205206

206207
@Test
@@ -214,7 +215,7 @@ public void testSignInMemory() throws Exception {
214215
MSIFile file = new MSIFile(channel);
215216

216217
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
217-
.withDigestAlgorithm(DigestAlgorithm.SHA512)
218+
.withDigestAlgorithm(SHA512)
218219
.withProgramName("Minimal Package")
219220
.withProgramURL("http://example.com");
220221

@@ -243,7 +244,7 @@ public void testAddExtendedSignature() throws Exception {
243244
MSIFile file = new MSIFile(targetFile);
244245

245246
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
246-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
247+
.withDigestAlgorithm(SHA1)
247248
.withProgramName("Minimal Package")
248249
.withProgramURL("http://example.com");
249250

‎jsign-core/src/test/java/net/jsign/PESignerTest.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import net.jsign.timestamp.TimestampingException;
4848
import net.jsign.timestamp.TimestampingMode;
4949

50+
import static net.jsign.DigestAlgorithm.*;
5051
import static org.junit.Assert.*;
5152

5253
public class PESignerTest {
@@ -220,12 +221,12 @@ public void testSigningWithMismatchingKeyAndCertificate() throws Exception {
220221

221222
@Test
222223
public void testTimestampAuthenticode() throws Exception {
223-
testTimestamp(TimestampingMode.AUTHENTICODE, DigestAlgorithm.SHA1);
224+
testTimestamp(TimestampingMode.AUTHENTICODE, SHA1);
224225
}
225226

226227
@Test
227228
public void testTimestampRFC3161() throws Exception {
228-
testTimestamp(TimestampingMode.RFC3161, DigestAlgorithm.SHA256);
229+
testTimestamp(TimestampingMode.RFC3161, SHA256);
229230
}
230231

231232
public void testTimestamp(TimestampingMode mode, DigestAlgorithm alg) throws Exception {
@@ -268,7 +269,7 @@ public void testWithTimestamper() throws Exception {
268269
final HashSet<Boolean> called = new HashSet<>();
269270

270271
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD);
271-
signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
272+
signer.withDigestAlgorithm(SHA1);
272273
signer.withTimestamping(true);
273274
signer.withTimestamper(new AuthenticodeTimestamper() {
274275

@@ -305,7 +306,7 @@ public void testSignTwice() throws Exception {
305306
PEFile peFile = new PEFile(targetFile);
306307

307308
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
308-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
309+
.withDigestAlgorithm(SHA1)
309310
.withTimestamping(true)
310311
.withProgramName("WinEyes")
311312
.withProgramURL("http://www.steelblue.com/WinEyes");
@@ -322,7 +323,7 @@ public void testSignTwice() throws Exception {
322323
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
323324

324325
// second signature
325-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
326+
signer.withDigestAlgorithm(SHA256);
326327
signer.withTimestamping(false);
327328
signer.sign(peFile);
328329

@@ -345,7 +346,7 @@ public void testSignThreeTimes() throws Exception {
345346
PEFile peFile = new PEFile(targetFile);
346347

347348
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
348-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
349+
.withDigestAlgorithm(SHA1)
349350
.withTimestamping(true)
350351
.withProgramName("WinEyes")
351352
.withProgramURL("http://www.steelblue.com/WinEyes");
@@ -362,7 +363,7 @@ public void testSignThreeTimes() throws Exception {
362363
SignatureAssert.assertTimestamped("Invalid timestamp", signatures.get(0));
363364

364365
// second signature
365-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
366+
signer.withDigestAlgorithm(SHA256);
366367
signer.withTimestamping(false);
367368
signer.sign(peFile);
368369

@@ -375,7 +376,7 @@ public void testSignThreeTimes() throws Exception {
375376
SignatureAssert.assertTimestamped("Timestamp corrupted after adding the second signature", signatures.get(0));
376377

377378
// third signature
378-
signer.withDigestAlgorithm(DigestAlgorithm.SHA512);
379+
signer.withDigestAlgorithm(SHA512);
379380
signer.withTimestamping(false);
380381
signer.sign(peFile);
381382

@@ -398,7 +399,7 @@ public void testReplaceSignature() throws Exception {
398399
PEFile peFile = new PEFile(targetFile);
399400

400401
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
401-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
402+
.withDigestAlgorithm(SHA1)
402403
.withProgramName("WinEyes")
403404
.withProgramURL("http://www.steelblue.com/WinEyes");
404405

@@ -413,7 +414,7 @@ public void testReplaceSignature() throws Exception {
413414
assertNotNull(signatures.get(0));
414415

415416
// second signature
416-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
417+
signer.withDigestAlgorithm(SHA256);
417418
signer.withTimestamping(false);
418419
signer.withSignaturesReplaced(true);
419420
signer.sign(peFile);
@@ -425,7 +426,7 @@ public void testReplaceSignature() throws Exception {
425426

426427
assertNotNull(signatures.get(0));
427428

428-
assertEquals("Digest algorithm", DigestAlgorithm.SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
429+
assertEquals("Digest algorithm", SHA256.oid, signatures.get(0).getDigestAlgorithmIDs().iterator().next().getAlgorithm());
429430
}
430431

431432
@Test
@@ -447,7 +448,7 @@ public void testInvalidTimestampingAuthority(TimestampingMode mode) throws Excep
447448
PEFile peFile = new PEFile(targetFile);
448449

449450
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD);
450-
signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
451+
signer.withDigestAlgorithm(SHA1);
451452
signer.withTimestamping(true);
452453
signer.withTimestampingMode(mode);
453454
signer.withTimestampingAuthority("http://www.google.com/" + mode.name().toLowerCase());
@@ -486,7 +487,7 @@ public void testBrokenTimestampingAuthority(TimestampingMode mode) throws Except
486487
PEFile peFile = new PEFile(targetFile);
487488

488489
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD);
489-
signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
490+
signer.withDigestAlgorithm(SHA1);
490491
signer.withTimestamping(true);
491492
signer.withTimestampingMode(mode);
492493
signer.withTimestampingAuthority("http://github.com");
@@ -510,7 +511,7 @@ public void testInvalidTimestampingURL() throws Exception {
510511
PEFile peFile = new PEFile(new File("target/test-classes/wineyes.exe"));
511512

512513
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD);
513-
signer.withDigestAlgorithm(DigestAlgorithm.SHA1);
514+
signer.withDigestAlgorithm(SHA1);
514515
signer.withTimestamping(true);
515516
signer.withTimestampingMode(TimestampingMode.RFC3161);
516517
signer.withTimestampingAuthority("example://example.com");
@@ -538,7 +539,7 @@ public void testTimestampingFailover(TimestampingMode mode, String validURL) thr
538539
PEFile peFile = new PEFile(targetFile);
539540

540541
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD);
541-
signer.withDigestAlgorithm(DigestAlgorithm.SHA256);
542+
signer.withDigestAlgorithm(SHA256);
542543
signer.withTimestamping(true);
543544
signer.withTimestampingMode(mode);
544545
signer.withTimestampingRetryWait(1);
@@ -571,7 +572,7 @@ public void testWithSignatureAlgorithmSHA1withRSA() throws Exception {
571572

572573
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
573574
.withTimestamping(false)
574-
.withDigestAlgorithm(DigestAlgorithm.SHA256)
575+
.withDigestAlgorithm(SHA256)
575576
.withSignatureAlgorithm("SHA1withRSA");
576577

577578
signer.sign(peFile);
@@ -617,7 +618,7 @@ public void testWithSignatureAlgorithmSHA256withRSAandMGF1() throws Exception {
617618

618619
PESigner signer = new PESigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
619620
.withTimestamping(false)
620-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
621+
.withDigestAlgorithm(SHA1)
621622
.withSignatureAlgorithm("SHA256withRSAandMGF1", "BC");
622623

623624
signer.sign(peFile);

‎jsign-core/src/test/java/net/jsign/PowerShellSignerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import net.jsign.script.PowerShellScript;
2626

27+
import static net.jsign.DigestAlgorithm.*;
2728
import static org.junit.Assert.*;
2829

2930
public class PowerShellSignerTest extends ScriptSignerTest {
@@ -39,7 +40,7 @@ public void testSignInMemory() throws Exception {
3940
script.setContent("write-host \"Hello World!\"\n");
4041

4142
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
42-
.withDigestAlgorithm(DigestAlgorithm.SHA512)
43+
.withDigestAlgorithm(SHA512)
4344
.withProgramName("Hello World")
4445
.withProgramURL("http://example.com");
4546

@@ -64,7 +65,7 @@ public void testSignScriptWithMessedEOL() throws Exception {
6465
script.setContent("write-host \"Hello World!\"\n");
6566

6667
AuthenticodeSigner signer = new AuthenticodeSigner(getKeyStore(), ALIAS, PRIVATE_KEY_PASSWORD)
67-
.withDigestAlgorithm(DigestAlgorithm.SHA1)
68+
.withDigestAlgorithm(SHA1)
6869
.withTimestamping(false);
6970

7071
signer.sign(script);

0 commit comments

Comments
 (0)