diff -r 4a09d4df104c -r 046e4024e55a src/java.base/share/classes/sun/security/tools/keytool/Main.java --- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java Thu Nov 14 16:34:24 2019 -0800 +++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java Fri Nov 15 09:06:58 2019 +0800 @@ -1151,17 +1151,15 @@ } } else if (command == GENKEYPAIR) { if (keyAlgName == null) { - keyAlgName = "DSA"; - weakWarnings.add(String.format(rb.getString( - "keyalg.option.1.missing.warning"), keyAlgName)); + throw new Exception(rb.getString( + "keyalg.option.missing.error")); } doGenKeyPair(alias, dname, keyAlgName, keysize, groupName, sigAlgName); kssave = true; } else if (command == GENSECKEY) { if (keyAlgName == null) { - keyAlgName = "DES"; - weakWarnings.add(String.format(rb.getString( - "keyalg.option.1.missing.warning"), keyAlgName)); + throw new Exception(rb.getString( + "keyalg.option.missing.error")); } doGenSecretKey(alias, keyAlgName, keysize); kssave = true;