Skip to content

Commit 4574240

Browse files
dghgitdghgit
committed
cleanup/compatibility changes
1 parent c3a7fc0 commit 4574240

File tree

11 files changed

+764
-38
lines changed

11 files changed

+764
-38
lines changed

‎core/src/test/java/org/bouncycastle/crypto/test/Grain128AEADTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ private void testVectors()
4848
data = line.split(" ");
4949
if (data.length == 1)
5050
{
51-
params = new ParametersWithIV(new KeyParameter(Hex.decode(map.get("Key"))), Hex.decode(map.get("Nonce")));
51+
params = new ParametersWithIV(new KeyParameter(Hex.decode((String)map.get("Key"))), Hex.decode((String)map.get("Nonce")));
5252
grain.init(true, params);
53-
adByte = Hex.decode(map.get("AD"));
53+
adByte = Hex.decode((String)map.get("AD"));
5454
grain.processAADBytes(adByte, 0, adByte.length);
55-
ptByte = Hex.decode(map.get("PT"));
55+
ptByte = Hex.decode((String)map.get("PT"));
5656
rv = new byte[ptByte.length];
5757
grain.processBytes(ptByte, 0, ptByte.length, rv, 0);
5858
byte[] mac = new byte[8];
5959
grain.doFinal(mac, 0);
60-
if (!areEqual(Arrays.concatenate(rv, mac), Hex.decode(map.get("CT"))))
60+
if (!areEqual(Arrays.concatenate(rv, mac), Hex.decode((String)map.get("CT"))))
6161
{
62-
mismatch("Keystream " + map.get("Count"), map.get("CT"), rv);
62+
mismatch("Keystream " + map.get("Count"), (String)map.get("CT"), rv);
6363
}
6464
map.clear();
6565
}

‎core/src/test/java/org/bouncycastle/crypto/test/RadixConverterTest.java‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void testBaseConversionMultipleDigitsInRadixRepresentation()
4848
RadixConversionArgument.builder()
4949
.setRadix(radix)
5050
.setNumberOfDigits(3)
51-
.setDecimalNumber(decimalInPolynomialForm(radix, 1, 0))
51+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 1, 0}))
5252
.setDigits(new short[]{0, 1, 0})
5353
.build();
5454
runTest(arg, new RadixConverter(arg.getRadix()));
@@ -57,7 +57,7 @@ void testBaseConversionMultipleDigitsInRadixRepresentation()
5757
RadixConversionArgument.builder()
5858
.setRadix(radix)
5959
.setNumberOfDigits(3)
60-
.setDecimalNumber(decimalInPolynomialForm(radix, 1, 1))
60+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 1, 1}))
6161
.setDigits(new short[]{0, 1, 1})
6262
.build();
6363
runTest(arg, new RadixConverter(arg.getRadix()));
@@ -66,7 +66,7 @@ void testBaseConversionMultipleDigitsInRadixRepresentation()
6666
RadixConversionArgument.builder()
6767
.setRadix(radix)
6868
.setNumberOfDigits(3)
69-
.setDecimalNumber(decimalInPolynomialForm(radix, 22, 13, 4))
69+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 22, 13, 4 }))
7070
.setDigits(new short[]{22, 13, 4})
7171
.build();
7272
runTest(arg, new RadixConverter(arg.getRadix()));
@@ -80,7 +80,7 @@ void testBaseConversionDecimalNumberLargerThanMaxLong()
8080
RadixConversionArgument.builder()
8181
.setRadix(radix)
8282
.setNumberOfDigits(21)
83-
.setDecimalNumber(decimalInPolynomialForm(radix, 234, 33, 0, 45, 125, 98, 12, 34, 100, 77, 211, 9, 3, 123, 96, 55, 23, 44, 98))
83+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 234, 33, 0, 45, 125, 98, 12, 34, 100, 77, 211, 9, 3, 123, 96, 55, 23, 44, 98}))
8484
// two leading zero because we are asking a message length 21 when the number can be encoded in 19 bytes
8585
.setDigits(new short[]{0, 0, 234, 33, 0, 45, 125, 98, 12, 34, 100, 77, 211, 9, 3, 123, 96, 55, 23, 44, 98})
8686
.build();
@@ -97,7 +97,7 @@ void testBaseConversionLargeDecimalNumberLeadingZerosInDigitGroup()
9797
RadixConversionArgument.builder()
9898
.setRadix(radix)
9999
.setNumberOfDigits(19)
100-
.setDecimalNumber(decimalInPolynomialForm(radix, 234, 33, 2, 45, 125, 0, 12, 34, 100, 77, 211, 9, 0, 0, 96, 55, 23, 44, 98))
100+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 234, 33, 2, 45, 125, 0, 12, 34, 100, 77, 211, 9, 0, 0, 96, 55, 23, 44, 98 }))
101101
.setDigits(new short[]{234, 33, 2, 45, 125, 0, 12, 34, 100, 77, 211, 9, 0, 0, 96, 55, 23, 44, 98})
102102
.build();
103103
RadixConverter radixConverter = new RadixConverter(arg.getRadix());
@@ -109,7 +109,7 @@ void testBaseConversionLargeDecimalNumberGroupWithAllZeros()
109109
{
110110
// 7 digits in base 251 is the max number that fits in a long
111111
int radix = 251;
112-
BigInteger decimalNumber = decimalInPolynomialForm(radix, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
112+
BigInteger decimalNumber = decimalInPolynomialForm(radix, new int[] { 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
113113
RadixConversionArgument arg =
114114
RadixConversionArgument.builder()
115115
.setRadix(radix)
@@ -147,7 +147,7 @@ void testBaseConversionNoPowersCached()
147147
RadixConversionArgument.builder()
148148
.setRadix(radix)
149149
.setNumberOfDigits(15)
150-
.setDecimalNumber(decimalInPolynomialForm(radix, 6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4))
150+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4 }))
151151
.setDigits(new short[]{6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4})
152152
.build();
153153
RadixConverter radixConverter = new RadixConverter(arg.getRadix(), 0);
@@ -163,7 +163,7 @@ void testBaseConversionSomePowersCached()
163163
RadixConversionArgument.builder()
164164
.setRadix(radix)
165165
.setNumberOfDigits(19)
166-
.setDecimalNumber(decimalInPolynomialForm(radix, 2756, 1111, 965, 0, 6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4))
166+
.setDecimalNumber(decimalInPolynomialForm(radix, new int[] { 2756, 1111, 965, 0, 6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4 }))
167167
.setDigits(new short[]{2756, 1111, 965, 0, 6, 200, 78, 9, 53, 90, 178, 213, 154, 65, 127, 99, 22, 13, 4})
168168
.build();
169169
// 2 powers cached - radix^4, (radix^4)^2
@@ -176,18 +176,15 @@ private void runTest(RadixConversionArgument arg, RadixConverter radixConverter)
176176
{
177177
short[] digits = new short[arg.getDigits().length];
178178
radixConverter.toEncoding(arg.getDecimalNumber(), arg.getNumberOfDigits(), digits);
179-
isTrue(
180-
String.format(
181-
"digits in base %d and expected digits are different.\nActual digits: [%s]\nExpected digits: [%s]",
182-
arg.getRadix(), arrayToString(digits), arrayToString(arg.getDigits())),
179+
isTrue("digits in base " + arg.getRadix() + " and expected digits are different.\nActual digits: [" + arrayToString(digits) +"]\nExpected digits: ["+ arrayToString(arg.getDigits()) +"]",
183180
Arrays.equals(digits, arg.getDigits()));
184181
BigInteger number = radixConverter.fromEncoding(digits);
185-
isEquals(String.format("%s and %s are different", number, arg.getDecimalNumber()), number, arg.getDecimalNumber());
182+
isEquals(number + " and " + arg.getDecimalNumber() + " are different", number, arg.getDecimalNumber());
186183
}
187184

188185
private String arrayToString(short[] array)
189186
{
190-
StringBuilder sb = new StringBuilder(array.length);
187+
StringBuffer sb = new StringBuffer(array.length);
191188
for (int i = 0; i != array.length; i++)
192189
{
193190
short el = array[i];
@@ -197,7 +194,7 @@ private String arrayToString(short[] array)
197194
return str.length() == 0 ? str : str.substring(0, str.length() - 1);
198195
}
199196

200-
private BigInteger decimalInPolynomialForm(int radix, int... coefficients)
197+
private BigInteger decimalInPolynomialForm(int radix, int[] coefficients)
201198
{
202199
BigInteger r = BigInteger.valueOf(radix);
203200
BigInteger result = BigInteger.ZERO;
@@ -214,10 +211,7 @@ private void checkAtLeastNDigitGroupsForTestCase(int atLeastDigitGroups, RadixCo
214211
{
215212
int groupLength = radixConverter.getDigitsGroupLength();
216213
int minDigits = (groupLength * (atLeastDigitGroups - 1)) + 1;
217-
isTrue(
218-
String.format(
219-
"test case is for large numbers. The number must have at least %d digits so that at least %d digits groups of length %d are found in it. Found %d digits",
220-
minDigits, atLeastDigitGroups, groupLength, arg.getDigits().length),
214+
isTrue("test case is for large numbers. The number must have at least " + minDigits + " digits so that at least "+atLeastDigitGroups+" digits groups of length "+groupLength+" are found in it. Found "+arg.getDigits().length+" digits",
221215
arg.getDigits().length >= minDigits);
222216
}
223217

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/AllTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public static Test suite()
1818
{
1919
TestSuite suite = new TestSuite("Lightweight PQ Crypto Tests");
2020

21-
suite.addTestSuite(EncryptionKeyTest.class);
2221
suite.addTestSuite(XMSSMTPrivateKeyTest.class);
2322
suite.addTestSuite(XMSSMTPublicKeyTest.class);
2423
suite.addTestSuite(XMSSMTSignatureTest.class);

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/BIKETest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testVectors()
7575
{
7676
if (buf.size() > 0)
7777
{
78-
String count = buf.get("count");
78+
String count = (String)buf.get("count");
7979
if (sampler.skipTest(count))
8080
{
8181
continue;

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/CrystalsKyberTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void testVectors()
139139
{
140140
if (buf.size() > 0)
141141
{
142-
String count = buf.get("count");
142+
String count = (String)buf.get("count");
143143
if (sampler.skipTest(count))
144144
{
145145
continue;

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/PicnicVectorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void testVectors()
112112
{
113113
if (buf.size() > 0)
114114
{
115-
String count = buf.get("count");
115+
String count = (String)buf.get("count");
116116
if (sampler.skipTest(count))
117117
{
118118
continue;

‎core/src/test/java/org/bouncycastle/pqc/legacy/crypto/test/AllTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import junit.framework.Test;
55
import junit.framework.TestCase;
66
import junit.framework.TestSuite;
7-
import org.bouncycastle.pqc.crypto.test.EncryptionKeyTest;
87
import org.bouncycastle.pqc.crypto.test.RegressionTest;
98
import org.bouncycastle.util.test.SimpleTestResult;
109

core/src/test/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java renamed to core/src/test/java/org/bouncycastle/pqc/legacy/crypto/test/EncryptionKeyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bouncycastle.pqc.crypto.test;
1+
package org.bouncycastle.pqc.legacy.crypto.test;
22

33
import java.io.ByteArrayInputStream;
44
import java.io.ByteArrayOutputStream;

‎pg/src/main/jdk1.4/org/bouncycastle/openpgp/KeyRingIterator.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package org.bouncycastle.openpgp;
2+
3+
import java.util.Iterator;
4+
import java.util.List;
5+
import java.util.Map;
6+
7+
class KeyRingIterator
8+
implements Iterator
9+
{
10+
private final Iterator iterator;
11+
private final Map rings;
12+
13+
KeyRingIterator(List ids, Map rings)
14+
{
15+
this.iterator = ids.iterator();
16+
this.rings = rings;
17+
}
18+
19+
public boolean hasNext()
20+
{
21+
return iterator.hasNext();
22+
}
23+
24+
public Object next()
25+
{
26+
return rings.get(iterator.next());
27+
}
28+
29+
public void remove()
30+
{
31+
throw new UnsupportedOperationException("remove not available");
32+
}
33+
}

0 commit comments

Comments
 (0)