Skip to content

Commit d3d4a3a

Browse files
dghgitdghgit
committed
Java 5 compatibility updates.
1 parent 4f71aac commit d3d4a3a

5 files changed

Lines changed: 33 additions & 26 deletions

File tree

‎core/src/test/java/org/bouncycastle/asn1/test/DLExternalTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.bouncycastle.asn1.test;
22

33
import java.io.IOException;
4-
import java.nio.charset.Charset;
54

65
import org.bouncycastle.asn1.ASN1BitString;
76
import org.bouncycastle.asn1.ASN1EncodableVector;
@@ -185,7 +184,7 @@ private void checkRealDataExample(int encoding, DLExternal dle)
185184
isTrue("check tag", objNameTagged.hasContextTag(3));
186185
isEquals("check implicit", false, objNameTagged.isExplicit());
187186
isEquals("check tagged object: " + objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass(), DEROctetString.class.getName(), objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass().getName());
188-
isEquals("check O", "Organization", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), Charset.forName("8859_1")));
187+
isEquals("check O", "Organization", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), "8859_1"));
189188
isEquals("check fourth element in set: " + objNameElems.getObjectAt(3).getClass(), DLTaggedObject.class.getName(), objNameElems.getObjectAt(3).getClass().getName());
190189
objNameTagged = (DLTaggedObject)objNameElems.getObjectAt(3);
191190
isTrue("check tag", objNameTagged.hasContextTag(5));
@@ -195,7 +194,7 @@ private void checkRealDataExample(int encoding, DLExternal dle)
195194
isTrue("check tag", objNameTagged.hasContextTag(0));
196195
isEquals("check implicit", false, objNameTagged.isExplicit());
197196
isEquals("check tagged object: " + objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass(), DEROctetString.class.getName(), objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass().getName());
198-
isEquals("check CN", "Common Name", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), Charset.forName("8859_1")));
197+
isEquals("check CN", "Common Name", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), "8859_1"));
199198

200199
isEquals("check second element in set: " + msBindSet.getObjectAt(1).getClass(), DLTaggedObject.class.getName(), msBindSet.getObjectAt(1).getClass().getName());
201200
DLTaggedObject password = (DLTaggedObject)msBindSet.getObjectAt(1);
@@ -217,8 +216,8 @@ private ASN1EncodableVector createRealDataExample(int encoding)
217216
ASN1EncodableVector objectNameVec = new ASN1EncodableVector();
218217
objectNameVec.add(new DLTaggedObject(BERTags.APPLICATION, 0, new DERPrintableString("de")));
219218
objectNameVec.add(new DLTaggedObject(BERTags.APPLICATION, 2, new DERPrintableString("viaT")));
220-
objectNameVec.add(new DLTaggedObject(false, 3, new DEROctetString("Organization".getBytes(Charset.forName("8859_1")))));
221-
objectNameVec.add(new DLTaggedObject(true, 5, new DLTaggedObject(false, 0, new DEROctetString("Common Name".getBytes(Charset.forName("8859_1"))))));
219+
objectNameVec.add(new DLTaggedObject(false, 3, new DEROctetString("Organization".getBytes("8859_1"))));
220+
objectNameVec.add(new DLTaggedObject(true, 5, new DLTaggedObject(false, 0, new DEROctetString("Common Name".getBytes("8859_1")))));
222221

223222
DLTaggedObject objectName = new DLTaggedObject(BERTags.APPLICATION, 0, new DLSequence(objectNameVec));
224223
DLTaggedObject password = new DLTaggedObject(true, 2, new DERIA5String("SomePassword"));

‎core/src/test/java/org/bouncycastle/asn1/test/StringTest.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.bouncycastle.asn1.test;
22

33
import java.io.IOException;
4-
import java.nio.charset.Charset;
4+
import java.io.UnsupportedEncodingException;
55

66
import org.bouncycastle.asn1.ASN1Primitive;
77
import org.bouncycastle.asn1.ASN1String;
@@ -87,17 +87,25 @@ public void performTest()
8787
}
8888

8989
byte[] t61Bytes = new byte[] { -1, -2, -3, -4, -5, -6, -7, -8 };
90-
String t61String = new String(t61Bytes, Charset.forName("iso-8859-1"));
91-
ASN1T61String t61 = new DERT61String(Strings.fromByteArray(t61Bytes));
9290

93-
if (!t61.getString().equals(t61String))
91+
try
9492
{
95-
fail("DERT61String.getString() result incorrect");
93+
String t61String = new String(t61Bytes, "iso-8859-1");
94+
ASN1T61String t61 = new DERT61String(Strings.fromByteArray(t61Bytes));
95+
96+
if (!t61.getString().equals(t61String))
97+
{
98+
fail("DERT61String.getString() result incorrect");
99+
}
100+
101+
if (!t61.toString().equals(t61String))
102+
{
103+
fail("DERT61String.toString() result incorrect");
104+
}
96105
}
97-
98-
if (!t61.toString().equals(t61String))
106+
catch (UnsupportedEncodingException e)
99107
{
100-
fail("DERT61String.toString() result incorrect");
108+
// ignore test
101109
}
102110

103111
char[] shortChars = new char[] { 'a', 'b', 'c', 'd', 'e'};

‎pkix/src/test/java/org/bouncycastle/cms/test/GOSTR3410_2012_256CmsSignVerifyDetached.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.security.cert.X509CertSelector;
99
import java.security.cert.X509Certificate;
1010
import java.util.ArrayList;
11-
import java.util.Base64;
1211
import java.util.Collection;
1312
import java.util.HashSet;
1413
import java.util.List;
@@ -27,6 +26,7 @@
2726
import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
2827
import org.bouncycastle.jce.provider.BouncyCastleProvider;
2928
import org.bouncycastle.util.Store;
29+
import org.bouncycastle.util.encoders.Base64;
3030

3131
public class GOSTR3410_2012_256CmsSignVerifyDetached
3232
extends TestCase
@@ -73,8 +73,8 @@ public void setUp()
7373
public void testGost3410_2012_256()
7474
throws Exception
7575
{
76-
byte[] detachedCms = Base64.getDecoder().decode(SIGNATURE);
77-
byte[] rootCertificate = Base64.getDecoder().decode(CA_CERTIFICATE);
76+
byte[] detachedCms = Base64.decode(SIGNATURE);
77+
byte[] rootCertificate = Base64.decode(CA_CERTIFICATE);
7878
List<X509CertificateHolder> trustedCertificates = new ArrayList<X509CertificateHolder>();
7979
trustedCertificates.add(new X509CertificateHolder(rootCertificate));
8080

‎tls/src/test/java/org/bouncycastle/test/JVMVersionTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
/**
77
* This test asserts the java version running the tests starts with
88
* a property value passed in as part of test invocation.
9-
*
9+
* <p>
1010
* -Dtest.java.version.prefix must match the start of System.getProperty("java.version")
1111
* So:
12-
* if -Dtest.java.version.prefix=17 and System.getProperty("java.version") = 17.0.4.1
13-
* Then this test will pass.
12+
* if -Dtest.java.version.prefix=17 and System.getProperty("java.version") = 17.0.4.1
13+
* Then this test will pass.
1414
*/
15-
public class JVMVersionTest extends TestCase
15+
public class JVMVersionTest
16+
extends TestCase
1617
{
1718

1819
private static final String expectedVersionPropName = "test.java.version.prefix";
1920

2021

2122
@Test
22-
public void testAssertExpectedJVM() {
23-
24-
23+
public void testAssertExpectedJVM()
24+
{
2525

2626

2727
//
@@ -34,13 +34,13 @@ public void testAssertExpectedJVM() {
3434
// It is important for multi-release jars to be exercised on a representative JVM for each JVM they support.
3535
//
3636
//
37-
assertNotNull(String.format("property %s is not set, see comment in test for reason why.",expectedVersionPropName),System.getProperty(expectedVersionPropName));
37+
assertNotNull(String.format("property %s is not set, see comment in test for reason why.", expectedVersionPropName), System.getProperty(expectedVersionPropName));
3838

3939

4040
String version = System.getProperty("java.version");
4141
String expectedPrefix = System.getProperty(expectedVersionPropName);
4242

43-
assertTrue(String.format("JVM Version: '%s' did not start with '%s' see comment in test",version,expectedPrefix), version.startsWith(expectedPrefix));
43+
assertTrue(String.format("JVM Version: '%s' did not start with '%s' see comment in test", version, expectedPrefix), version.startsWith(expectedPrefix));
4444

4545

4646
}

‎tls/src/test/jdk1.5/org/bouncycastle/test/JVMVersionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* if -Dtest.java.version.prefix=17 and System.getProperty("java.version") = 17.0.4.1
1212
* Then this test will pass.
1313
*/
14-
public class JVMVersionTestTLS extends TestCase
14+
public class JVMVersionTest extends TestCase
1515
{
1616

1717
private static final String expectedVersionPropName = "test.java.version.prefix";

0 commit comments

Comments
 (0)