8331391: Enhance the keytool code by invoking the buildTrustedCerts method for essential options

GoeLin · GoeLin · commit 1928a36adea8 · 2024-10-01T10:47:58.000Z
Backport-of: c9bee173d61f4accfc4adc280ab5d21600191756
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1125,7 +1125,6 @@ && isKeyStoreRelated(command)
             }
         }
 
-        KeyStore cakstore = buildTrustedCerts();
         // -trustcacerts can be specified on -importcert, -printcert or -printcrl.
         // Reset it so that warnings on CA cert will remain for other command.
         if (command != IMPORTCERT && command != PRINTCERT
@@ -1134,6 +1133,7 @@ && isKeyStoreRelated(command)
         }
 
         if (trustcacerts) {
+            KeyStore cakstore = buildTrustedCerts();
             if (cakstore != null) {
                 caks = cakstore;
             } else {

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,6 @@ && isKeyStoreRelated(command)`
`1125`	`1125`	`}`
`1126`	`1126`	`}`
`1127`	`1127`
`1128`		`- KeyStore cakstore = buildTrustedCerts();`
`1129`	`1128`	`// -trustcacerts can be specified on -importcert, -printcert or -printcrl.`
`1130`	`1129`	`// Reset it so that warnings on CA cert will remain for other command.`
`1131`	`1130`	`if (command != IMPORTCERT && command != PRINTCERT`
`@@ -1134,6 +1133,7 @@ && isKeyStoreRelated(command)`
`1134`	`1133`	`}`
`1135`	`1134`
`1136`	`1135`	`if (trustcacerts) {`
	`1136`	`+ KeyStore cakstore = buildTrustedCerts();`
`1137`	`1137`	`if (cakstore != null) {`
`1138`	`1138`	`caks = cakstore;`
`1139`	`1139`	`} else {`