merge 8.1 -> tip, multiple bugs (base)

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1134 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 16 insertions, 0 deletions

diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/subca/ConfigureSubCA.java
index 1ecbce405..69bc97a3e 100644
--- a/pki/base/silent/src/subca/ConfigureSubCA.java
+++ b/pki/base/silent/src/subca/ConfigureSubCA.java
@@ -98,6 +98,7 @@ public class ConfigureSubCA
 
 	public static String key_size = null;
 	public static String key_type = null;
+	public static String key_algorithm = null;
 	public static String token_name = null;
 	public static String token_pwd = null;
 
@@ -420,21 +421,27 @@ public class ConfigureSubCA
 
 		String query_string = "p=10" + "&op=next" + "&xml=true" +
 							"&keytype=" + key_type + 
+                                                        "&keyalgorithm=" + key_algorithm +
 							"&choice=default"+
 							"&custom_size=" + key_size +
 							"&signing_keytype=" + key_type + 
+                                                        "&signing_keyalgorithm=" + key_algorithm +
 							"&signing_choice=default"+
 							"&signing_custom_size=" + key_size +
 							"&ocsp_signing_keytype=" + key_type + 
+                                                        "&ocsp_signing_keyalgorithm=" + key_algorithm +
 							"&ocsp_signing_choice=default"+
 							"&ocsp_signing_custom_size=" + key_size +
 							"&sslserver_keytype=" + key_type + 
+                                                        "&sslserver_keyalgorithm=" + key_algorithm +
 							"&sslserver_choice=default"+
 							"&sslserver_custom_size=" + key_size +
 							"&subsystem_keytype=" + key_type + 
+                                                        "&subsystem_keyalgorithm=" + key_algorithm +
 							"&subsystem_choice=default"+
 							"&subsystem_custom_size=" + key_size +
                             "&audit_signing_keytype=" + key_type +
+                            "&audit_signing_keyalgorithm=" + key_algorithm +
                             "&audit_signing_choice=default" + 
                             "&audit_signing_custom_size=" + key_size + 
 							""; 
@@ -982,6 +989,7 @@ public class ConfigureSubCA
 		// key size
 		StringHolder x_key_size = new StringHolder();
 		StringHolder x_key_type = new StringHolder();
+		StringHolder x_key_algorithm = new StringHolder();
 		StringHolder x_token_name = new StringHolder();
 		StringHolder x_token_pwd = new StringHolder();
 
@@ -1064,6 +1072,8 @@ public class ConfigureSubCA
 							x_key_size); 
 		parser.addOption ("-key_type %s #Key type [RSA,ECC]",
 							x_key_type); 
+		parser.addOption ("-key_algorithm %s #Key algorithm",
+							x_key_algorithm); 
 		parser.addOption ("-token_name %s #HSM/Software Token name",
 							x_token_name); 
 		parser.addOption ("-token_pwd %s #HSM/Software Token password (optional - required for HSM)",
@@ -1143,6 +1153,12 @@ public class ConfigureSubCA
 
 		key_size = x_key_size.value;
 		key_type = x_key_type.value;
+                if ((x_key_algorithm.value == null) || (x_key_algorithm.equals(""))) {
+                    key_algorithm = "SHA256withRSA";
+                } else {
+                    key_algorithm = x_key_algorithm.value;
+                }
+
 		token_name = x_token_name.value;
 		token_pwd = x_token_pwd.value;