more strings

wangweij · Dec 13, 2024 · 53c9a7e · 53c9a7e
1 parent ebff311
commit 53c9a7e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
@@ -495,7 +495,7 @@ public class Resources extends java.util.ListResourceBundle {
         {"Unable.to.parse.denyAfter.string.in.exception.message", "Unable to parse denyAfter date string in exception message"},
         {"whose.sigalg.weak", "%1$s uses the %2$s signature algorithm which is considered a security risk."},
         {"whose.key.disabled", "%1$s uses a %2$s which is considered a security risk and is disabled."},
-        {"whose.key.weak", "%1$s uses a %2$s which is considered a security risk. This key size will be disabled in a future update."},
+        {"whose.key.weak", "%1$s uses a %2$s which is considered a security risk. It will be disabled in a future update."},
         {"jks.storetype.warning", "The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
         {"migrate.keystore.warning", "Migrated \"%1$s\" to %4$s. The %2$s keystore is backed up as \"%3$s\"."},
         {"backup.keystore.warning", "The original keystore \"%1$s\" is backed up as \"%3$s\"..."},

diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -1250,7 +1250,7 @@ private void displayMessagesAndResult(boolean isSigning) {
 
             if ((legacyAlg & 8) == 8) {
                 warnings.add(String.format(
-                        rb.getString("The.full.keyAlgName.signing.key.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
+                        rb.getString("The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update."),
                         fullDisplayKeyName(privateKey)));
             }
 
@@ -1280,7 +1280,7 @@ private void displayMessagesAndResult(boolean isSigning) {
 
             if ((legacyAlg & 8) == 8) {
                 warnings.add(String.format(
-                        rb.getString("The.full.keyAlgName.signing.key.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
+                        rb.getString("The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update."),
                         fullDisplayKeyName(weakPublicKey)));
             }
         }

diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -296,8 +296,8 @@ public class Resources extends java.util.ListResourceBundle {
                 "The %1$s signature algorithm is considered a security risk. This algorithm will be disabled in a future update."},
         {"size.bit.alg",
                 "%1$d-bit %2$s"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
-                "The %s signing key is considered a security risk. This key size will be disabled in a future update."},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
+                "The %s signing key is considered a security risk. It will be disabled in a future update."},
         {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
                 "The %s signing key is considered a security risk and is disabled."},
         {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",

diff --git a/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java b/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
@@ -84,7 +84,7 @@ public static void main(String[] args) throws Exception{
                 .shouldContain(">>> Signer")
                 .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (weak)")
                 .shouldContain("Warning:")
-                .shouldContain("The 256-bit EC (secp256r1) signing key is considered a security risk. This key size will be disabled in a future update")
+                .shouldContain("The 256-bit EC (secp256r1) signing key is considered a security risk. It will be disabled in a future update")
                 .shouldHaveExitValue(0);
 
         SecurityTools.jarsigner("-verify signeda.jar " +
@@ -94,7 +94,7 @@ public static void main(String[] args) throws Exception{
                 .shouldContain("- Signed by")
                 .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (weak)")
                 .shouldContain("jar verified")
-                .shouldContain("The 256-bit EC (secp256r1) signing key is considered a security risk. This key size will be disabled in a future update")
+                .shouldContain("The 256-bit EC (secp256r1) signing key is considered a security risk. It will be disabled in a future update")
                 .shouldHaveExitValue(0);
     }
 }
diff --git a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
@@ -149,7 +149,7 @@ public abstract class Test {
             + "This algorithm will be disabled in a future update.";
 
     static final String WEAK_KEY_WARNING
-            = "This key size will be disabled in a future update.";
+            = "It will be disabled in a future update.";
 
     static final String JAR_SIGNED = "jar signed.";