Skip to content

Commit 019ecf5

Browse files
dghgitdghgit
committed
Java 5 updates
1 parent 67ea238 commit 019ecf5

File tree

2 files changed

+118
-4
lines changed

2 files changed

+118
-4
lines changed

‎pg/src/test/java/org/bouncycastle/openpgp/test/ArmoredInputStreamTest.java

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

33
import java.io.ByteArrayInputStream;
44
import java.io.IOException;
5-
import java.nio.charset.StandardCharsets;
65
import java.security.Security;
76

87
import org.bouncycastle.bcpg.ArmoredInputStream;
@@ -142,7 +141,7 @@ private void unknownClearsignedMessageHeadersTest()
142141
"-----END PGP SIGNATURE-----";
143142

144143
// Test validation is not enabled by default
145-
ByteArrayInputStream bIn = new ByteArrayInputStream(armor.getBytes(StandardCharsets.UTF_8));
144+
ByteArrayInputStream bIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(armor));
146145
ArmoredInputStream aIn = ArmoredInputStream.builder()
147146
.build(bIn);
148147
// Skip over cleartext
@@ -158,7 +157,7 @@ private void unknownClearsignedMessageHeadersTest()
158157

159158

160159
// Test validation enabled
161-
bIn = new ByteArrayInputStream(armor.getBytes(StandardCharsets.UTF_8));
160+
bIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(armor));
162161
final ByteArrayInputStream finalBIn = bIn;
163162
isTrue(null != testException(
164163
"Illegal ASCII armor header line in clearsigned message encountered: Hello: this is totally part of the signed text",
@@ -177,7 +176,7 @@ public void operation()
177176

178177

179178
// Test validation enabled, but custom header allowed
180-
bIn = new ByteArrayInputStream(armor.getBytes(StandardCharsets.UTF_8));
179+
bIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(armor));
181180
aIn = ArmoredInputStream.builder()
182181
.setValidateClearsignedMessageHeaders(true)
183182
.addAllowedArmorHeader("Hello")

‎prov/src/test/jdk1.5/org/bouncycastle/jce/provider/test/RegressionTest.java

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
package org.bouncycastle.jce.provider.test;
2+
3+
import java.security.Security;
4+
5+
import org.bouncycastle.jce.provider.BouncyCastleProvider;
6+
import org.bouncycastle.util.test.SimpleTest;
7+
import org.bouncycastle.util.test.Test;
8+
9+
public class RegressionTest
10+
{
11+
public static Test[] tests = {
12+
new AEADTest(),
13+
new AESSICTest(),
14+
new AESTest(),
15+
new AlgorithmParametersTest(),
16+
new ARIATest(),
17+
new BCFKSStoreTest(),
18+
new BlockCipherTest(),
19+
new CamelliaTest(),
20+
new CertLocaleTest(),
21+
new CertPathBuilderTest(),
22+
new CertPathTest(),
23+
new CertPathValidatorTest(),
24+
new CertStoreTest(),
25+
new CertTest(),
26+
new CertUniqueIDTest(),
27+
new ChaCha20Poly1305Test(),
28+
new CipherStreamTest(),
29+
new CipherStreamTest2(),
30+
new CMacTest(),
31+
new CRL5Test(),
32+
new DESedeTest(),
33+
new DetDSATest(),
34+
new DHIESTest(),
35+
new DHTest(),
36+
new DigestTest(),
37+
new DoFinalTest(),
38+
new DRBGTest(),
39+
new DSATest(),
40+
new DSTU4145Test(),
41+
new DSTU7624Test(),
42+
new ECDSA5Test(),
43+
new ECEncodingTest(),
44+
new ECIESTest(),
45+
new ECIESVectorTest(),
46+
new ECNRTest(),
47+
new EdECTest(),
48+
new ElGamalTest(),
49+
new EncryptedPrivateKeyInfoTest(),
50+
new FIPSDESTest(),
51+
new GMacTest(),
52+
new GOST28147Test(),
53+
new GOST3410KeyPairTest(),
54+
new GOST3410Test(),
55+
new GOST3412Test(),
56+
new HMacTest(),
57+
new IESTest(),
58+
new ImplicitlyCaTest(),
59+
new KeccakTest(),
60+
new KeyStoreTest(),
61+
new MacTest(),
62+
new MQVTest(),
63+
new MultiCertStoreTest(),
64+
new NamedCurveTest(),
65+
new NetscapeCertRequestTest(),
66+
new NISTCertPathTest(),
67+
new NoekeonTest(),
68+
new OCBTest(),
69+
new OpenSSHSpecTests(),
70+
new PBETest(),
71+
new PKCS10CertRequestTest(),
72+
new PKCS12StorePBETest(),
73+
new PKCS12StoreTest(),
74+
new PKIXNameConstraintsTest(),
75+
new PKIXPolicyMappingTest(),
76+
new PKIXTest(),
77+
new Poly1305Test(),
78+
new PQCDHTest(),
79+
new PSSTest(),
80+
new RSATest(),
81+
new SealedTest(),
82+
new SEEDTest(),
83+
new SerialisationTest(),
84+
new Shacal2Test(),
85+
new SigNameTest(),
86+
new SignatureTest(),
87+
new SigTest(),
88+
new SipHash128Test(),
89+
new SipHashTest(),
90+
new SkeinTest(),
91+
new SlotTwoTest(),
92+
new SM2CipherTest(),
93+
new SM2SignatureTest(),
94+
new SM4Test(),
95+
new ThreefishTest(),
96+
new TLSKDFTest(),
97+
new WrapTest(),
98+
new X509CertificatePairTest(),
99+
new X509StreamParserTest(),
100+
new XIESTest(),
101+
new XOFTest(),
102+
new ZucTest(),
103+
};
104+
105+
public static void main(String[] args)
106+
{
107+
System.setProperty("org.bouncycastle.bks.enable_v1", "true");
108+
109+
Security.addProvider(new BouncyCastleProvider());
110+
111+
System.out.println("Testing " + Security.getProvider("BC").getInfo() + " version: " + Security.getProvider("BC").getVersion());
112+
113+
SimpleTest.runTests(tests);
114+
}
115+
}

0 commit comments

Comments
 (0)