|
7 | 7 |
|
8 | 8 | import com.google.common.jimfs.Configuration;
|
9 | 9 | import com.google.common.jimfs.Jimfs;
|
10 |
| -import org.bouncycastle.asn1.DLTaggedObject; |
11 |
| -import org.elasticsearch.bootstrap.JavaVersion; |
12 |
| -import org.elasticsearch.core.internal.io.IOUtils; |
13 | 10 | import org.bouncycastle.asn1.ASN1ObjectIdentifier;
|
14 | 11 | import org.bouncycastle.asn1.ASN1Sequence;
|
15 | 12 | import org.bouncycastle.asn1.ASN1String;
|
16 | 13 | import org.bouncycastle.asn1.DEROctetString;
|
| 14 | +import org.bouncycastle.asn1.DLTaggedObject; |
17 | 15 | import org.bouncycastle.asn1.pkcs.Attribute;
|
18 | 16 | import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
|
19 | 17 | import org.bouncycastle.asn1.x509.Extension;
|
|
30 | 28 | import org.elasticsearch.common.io.PathUtils;
|
31 | 29 | import org.elasticsearch.common.network.NetworkAddress;
|
32 | 30 | import org.elasticsearch.common.settings.Settings;
|
| 31 | +import org.elasticsearch.core.internal.io.IOUtils; |
33 | 32 | import org.elasticsearch.env.Environment;
|
34 | 33 | import org.elasticsearch.env.TestEnvironment;
|
35 | 34 | import org.elasticsearch.test.ESTestCase;
|
36 | 35 | import org.elasticsearch.test.SecuritySettingsSourceField;
|
| 36 | +import org.elasticsearch.xpack.core.ssl.CertParsingUtils; |
| 37 | +import org.elasticsearch.xpack.core.ssl.PemUtils; |
37 | 38 | import org.elasticsearch.xpack.security.cli.CertificateGenerateTool.CAInfo;
|
38 | 39 | import org.elasticsearch.xpack.security.cli.CertificateGenerateTool.CertificateInformation;
|
39 | 40 | import org.elasticsearch.xpack.security.cli.CertificateGenerateTool.Name;
|
|
43 | 44 | import org.junit.After;
|
44 | 45 | import org.junit.BeforeClass;
|
45 | 46 |
|
46 |
| -import javax.security.auth.x500.X500Principal; |
47 |
| - |
48 | 47 | import java.io.IOException;
|
49 | 48 | import java.io.InputStream;
|
50 | 49 | import java.io.Reader;
|
|
74 | 73 | import java.util.Set;
|
75 | 74 | import java.util.function.Function;
|
76 | 75 | import java.util.stream.Collectors;
|
| 76 | +import javax.security.auth.x500.X500Principal; |
77 | 77 |
|
78 | 78 | import static org.elasticsearch.test.TestMatchers.pathExists;
|
79 | 79 | import static org.hamcrest.Matchers.containsString;
|
@@ -265,7 +265,8 @@ public void testGeneratingCsr() throws Exception {
|
265 | 265 |
|
266 | 266 | public void testGeneratingSignedCertificates() throws Exception {
|
267 | 267 | assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72639",
|
268 |
| - JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0); |
| 268 | + "1.8.0_292".equals(System.getProperty("java.version"))); |
| 269 | + |
269 | 270 | Path tempDir = initTempDir();
|
270 | 271 | Path outputFile = tempDir.resolve("out.zip");
|
271 | 272 | Path instanceFile = writeInstancesTo(tempDir.resolve("instances.yml"));
|
|
0 commit comments