Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix QueryPhaseResultConsumer incomplete callback loops ([#19231](https://github.com/opensearch-project/OpenSearch/pull/19231))
- Fix the `scaled_float` precision issue ([#19188](https://github.com/opensearch-project/OpenSearch/pull/19188))
- Fix Using an excessively large reindex slice can lead to a JVM OutOfMemoryError on coordinator.([#18964](https://github.com/opensearch-project/OpenSearch/pull/18964))
- [Flakey Test] Fix flakey tests in SecureReactorNetty4HttpServerTransportTests ([#19327](https://github.com/opensearch-project/OpenSearch/pull/19327))

### Dependencies
- Bump `com.netflix.nebula.ospackage-base` from 12.0.0 to 12.1.0 ([#19019](https://github.com/opensearch-project/OpenSearch/pull/19019))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;

public class KeyStoreUtils {

Expand Down Expand Up @@ -49,20 +51,31 @@ private static X500PrivateCredential createCredential() throws Exception {
}

private static X509CertificateHolder generateCert(KeyPair pair) throws Exception {
var baseTime = System.currentTimeMillis();
// 10 years in milliseconds
var validityPeriod = 10L * 365 * 24 * 60 * 60 * 1000;
// Use UTC timezone and ROOT locale to avoid locale-specific date formatting issues
var originalLocale = Locale.getDefault();
var originalTimeZone = TimeZone.getDefault();
try {
Locale.setDefault(Locale.ROOT);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

var certBuilder = new JcaX509v1CertificateBuilder(
new X500Principal("CN=Test CA Certificate"),
BigInteger.valueOf(1),
new Date(baseTime),
new Date(baseTime + validityPeriod),
new X500Principal("CN=Test CA Certificate"),
pair.getPublic()
);
var signer = new JcaContentSignerBuilder("SHA256withRSA").build(pair.getPrivate());
return certBuilder.build(signer);
var baseTime = System.currentTimeMillis();
// 10 years in milliseconds
var validityPeriod = 10L * 365 * 24 * 60 * 60 * 1000;

var certBuilder = new JcaX509v1CertificateBuilder(
new X500Principal("CN=Test CA Certificate"),
BigInteger.valueOf(1),
new Date(baseTime),
new Date(baseTime + validityPeriod),
new X500Principal("CN=Test CA Certificate"),
pair.getPublic()
);
var signer = new JcaContentSignerBuilder("SHA256withRSA").build(pair.getPrivate());
return certBuilder.build(signer);
} finally {
Locale.setDefault(originalLocale);
TimeZone.setDefault(originalTimeZone);
}
}

}
Loading