stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8185934: keytool shows "Signature algorithm: SHA1withECDSA, -1-bit key"

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2017-08-08 21:37:38 +08:00
parent 36378834a9
commit 43ead07d44
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
View File

@ -3071,8 +3071,14 @@ public final class Main {
private String withWeak(PublicKey key) { private String withWeak(PublicKey key) {
if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, key)) { if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, key)) {
return String.format(rb.getString("key.bit"), int kLen = KeyUtil.getKeySize(key);
KeyUtil.getKeySize(key), key.getAlgorithm()); if (kLen >= 0) {
return String.format(rb.getString("key.bit"),
kLen, key.getAlgorithm());
} else {
return String.format(
rb.getString("unknown.size.1"), key.getAlgorithm());
}
} else { } else {
return String.format(rb.getString("key.bit.weak"), return String.format(rb.getString("key.bit.weak"),
KeyUtil.getKeySize(key), key.getAlgorithm()); KeyUtil.getKeySize(key), key.getAlgorithm());

1
jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
View File

@ -462,6 +462,7 @@ public class Resources extends java.util.ListResourceBundle {
{"with.weak", "%s (weak)"}, {"with.weak", "%s (weak)"},
{"key.bit", "%d-bit %s key"}, {"key.bit", "%d-bit %s key"},
{"key.bit.weak", "%d-bit %s key (weak)"}, {"key.bit.weak", "%d-bit %s key (weak)"},
{"unknown.size.1", "unknown size %s key"},
{".PATTERN.printX509Cert.with.weak", {".PATTERN.printX509Cert.with.weak",
"Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8}\nVersion: {9}"}, "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8}\nVersion: {9}"},
{"PKCS.10.with.weak", {"PKCS.10.with.weak",

8
jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
View File

@ -1088,8 +1088,12 @@ public class Main {
private String withWeak(PublicKey key) { private String withWeak(PublicKey key) {
if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, key)) { if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, key)) {
return String.format( int kLen = KeyUtil.getKeySize(key);
rb.getString("key.bit"), KeyUtil.getKeySize(key)); if (kLen >= 0) {
return String.format(rb.getString("key.bit"), kLen);
} else {
return rb.getString("unknown.size");
}
} else { } else {
seeWeak = true; seeWeak = true;
return String.format( return String.format(

1
jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
View File

@ -164,6 +164,7 @@ public class Resources extends java.util.ListResourceBundle {
{"with.weak", "%s (weak)"}, {"with.weak", "%s (weak)"},
{"key.bit", "%d-bit key"}, {"key.bit", "%d-bit key"},
{"key.bit.weak", "%d-bit key (weak)"}, {"key.bit.weak", "%d-bit key (weak)"},
{"unknown.size", "unknown size"},
{"jarsigner.", "jarsigner: "}, {"jarsigner.", "jarsigner: "},
{"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.", {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",