summaryrefslogtreecommitdiffstats
path: root/src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java b/src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java
index b91cd0c..a7ea2ea 100644
--- a/src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java
+++ b/src/test/java/org/uic/barcode/test/DynamicFrameDynamicContentTest.java
@@ -7,6 +7,7 @@ import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
+import java.security.Provider;
import java.security.SecureRandom;
import java.security.Security;
import java.security.SignatureException;
@@ -48,9 +49,13 @@ public class DynamicFrameDynamicContentTest {
ZonedDateTime originalTimeStamp = ZonedDateTime.now(ZoneId.of("UTC"));
+ public Provider provider = null;
+
public IUicRailTicket testFCBticket = null;
+
+
@Before public void initialize() {
LoggerFactory.setActivateConsoleLog(true);
@@ -61,7 +66,8 @@ public class DynamicFrameDynamicContentTest {
testFCBticket = SimpleUICTestTicket.getUicTestTicket();
- Security.addProvider(new BouncyCastleProvider());
+ provider = new BouncyCastleProvider();
+ Security.addProvider(provider);
try {
keyPairLevel1 = generateECKeys(keyPairAlgorithmOID, elipticCurve);
@@ -94,7 +100,7 @@ public class DynamicFrameDynamicContentTest {
enc.setLevel2Algs(signatureAlgorithmOID, keyPairAlgorithmOID, keyPairLevel2.getPublic());
try {
- enc.signLevel1("1080", keyPairLevel1.getPrivate(), signatureAlgorithmOID, "1");
+ enc.signLevel1("1080", keyPairLevel1.getPrivate(), signatureAlgorithmOID, "1", provider);
} catch (Exception e) {
assert(false);
}
@@ -115,7 +121,7 @@ public class DynamicFrameDynamicContentTest {
dcd.setGeoCoordinate(geo);
enc.setDynamicContentDataUIC1(dcd);
- enc.signLevel2(keyPairLevel2.getPrivate());
+ enc.signLevel2(keyPairLevel2.getPrivate(),provider);
} catch (Exception e) {
assert(false);
}
@@ -151,7 +157,7 @@ public class DynamicFrameDynamicContentTest {
enc.setLevel2Algs(signatureAlgorithmOID, keyPairAlgorithmOID, keyPairLevel2.getPublic());
try {
- enc.signLevel1("1080", keyPairLevel1.getPrivate(), signatureAlgorithmOID, "1");
+ enc.signLevel1("1080", keyPairLevel1.getPrivate(), signatureAlgorithmOID, "1",provider);
} catch (Exception e) {
assert(false);
}
@@ -173,7 +179,7 @@ public class DynamicFrameDynamicContentTest {
dcd.setTimeStamp(ts);
enc.setDynamicContentDataUIC1(dcd);
- enc.signLevel2(keyPairLevel2.getPrivate());
+ enc.signLevel2(keyPairLevel2.getPrivate(),provider);
} catch (Exception e) {
assert(false);
}
@@ -202,7 +208,7 @@ public class DynamicFrameDynamicContentTest {
int signatureCheck = 0;
try {
- signatureCheck = dec.validateLevel1(keyPairLevel1.getPublic(),null);
+ signatureCheck = dec.validateLevel1(keyPairLevel1.getPublic(),null,provider);
} catch (InvalidKeyException | NoSuchAlgorithmException | SignatureException | IllegalArgumentException
| UnsupportedOperationException | IOException | EncodingFormatException e) {
assert(false);
@@ -214,7 +220,7 @@ public class DynamicFrameDynamicContentTest {
int level2check = 0;
try {
- level2check = dec.validateLevel2();
+ level2check = dec.validateLevel2(provider);
} catch (Exception e) {
assert(false);
}