forked from pool/java-1_8_0-openjdk
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
--- icedtea-3.8.0/openjdk/jdk/test/java/security/SignedObject/Chain.java 2018-09-18 09:35:10.475645535 +0200
|
|
+++ icedtea-3.8.0/openjdk/jdk/test/java/security/SignedObject/Chain.java 2018-09-18 09:36:00.147915474 +0200
|
|
@@ -142,8 +142,17 @@
|
|
PrivateKey[] privKeys = new PrivateKey[N];
|
|
PublicKey[] pubKeys = new PublicKey[N];
|
|
PublicKey[] anotherPubKeys = new PublicKey[N];
|
|
- KeyPairGenerator kpg = KeyPairGenerator.getInstance(
|
|
- test.keyAlg.name);
|
|
+ Signature signature;
|
|
+ KeyPairGenerator kpg;
|
|
+ if (test.provider != Provider.Default) {
|
|
+ signature = Signature.getInstance(test.sigAlg.name,
|
|
+ test.provider.name);
|
|
+ kpg = KeyPairGenerator.getInstance(
|
|
+ test.keyAlg.name, test.provider.name);
|
|
+ } else {
|
|
+ signature = Signature.getInstance(test.sigAlg.name);
|
|
+ kpg = KeyPairGenerator.getInstance(test.keyAlg.name);
|
|
+ }
|
|
for (int j=0; j < N; j++) {
|
|
if (test.keySize != -1) {
|
|
kpg.initialize(test.keySize);
|
|
@@ -162,14 +171,6 @@
|
|
}
|
|
}
|
|
|
|
- Signature signature;
|
|
- if (test.provider != Provider.Default) {
|
|
- signature = Signature.getInstance(test.sigAlg.name,
|
|
- test.provider.name);
|
|
- } else {
|
|
- signature = Signature.getInstance(test.sigAlg.name);
|
|
- }
|
|
-
|
|
// Create a chain of signed objects
|
|
SignedObject[] objects = new SignedObject[N];
|
|
objects[0] = new SignedObject(str, privKeys[0], signature);
|