|
8 | 8 |
|
9 | 9 | package org.opensearch.test; |
10 | 10 |
|
| 11 | +import org.bouncycastle.asn1.x500.X500Name; |
| 12 | +import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; |
11 | 13 | import org.bouncycastle.cert.X509CertificateHolder; |
| 14 | +import org.bouncycastle.cert.X509v1CertificateBuilder; |
12 | 15 | import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; |
13 | | -import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder; |
14 | 16 | import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; |
15 | 17 |
|
16 | 18 | import javax.security.auth.x500.X500Principal; |
|
22 | 24 | import java.security.KeyStore; |
23 | 25 | import java.security.cert.X509Certificate; |
24 | 26 | import java.util.Date; |
| 27 | +import java.util.Locale; |
25 | 28 |
|
26 | 29 | public class KeyStoreUtils { |
27 | 30 |
|
@@ -53,13 +56,14 @@ private static X509CertificateHolder generateCert(KeyPair pair) throws Exception |
53 | 56 | // 10 years in milliseconds |
54 | 57 | var validityPeriod = 10L * 365 * 24 * 60 * 60 * 1000; |
55 | 58 |
|
56 | | - var certBuilder = new JcaX509v1CertificateBuilder( |
57 | | - new X500Principal("CN=Test CA Certificate"), |
| 59 | + var certBuilder = new X509v1CertificateBuilder( |
| 60 | + X500Name.getInstance(new X500Principal("CN=Test CA Certificate").getEncoded()), |
58 | 61 | BigInteger.valueOf(1), |
59 | 62 | new Date(baseTime), |
60 | 63 | new Date(baseTime + validityPeriod), |
61 | | - new X500Principal("CN=Test CA Certificate"), |
62 | | - pair.getPublic() |
| 64 | + Locale.ROOT, |
| 65 | + X500Name.getInstance(new X500Principal("CN=Test CA Certificate").getEncoded()), |
| 66 | + SubjectPublicKeyInfo.getInstance(pair.getPublic().getEncoded()) |
63 | 67 | ); |
64 | 68 | var signer = new JcaContentSignerBuilder("SHA256withRSA").build(pair.getPrivate()); |
65 | 69 | return certBuilder.build(signer); |
|
0 commit comments