diff options
| author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-27 19:03:40 +0000 |
|---|---|---|
| committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-27 19:03:40 +0000 |
| commit | 2eb3243de06f1589991da47bfde6271e0d80abe6 (patch) | |
| tree | 8168ed24525ffd35989d54bd6dd81471d5df0b08 /pki/base/silent/templates | |
| parent | 9f8b12b0400f654f8b3f10ddbd731735c1d45607 (diff) | |
| download | pki-2eb3243de06f1589991da47bfde6271e0d80abe6.tar.gz pki-2eb3243de06f1589991da47bfde6271e0d80abe6.tar.xz pki-2eb3243de06f1589991da47bfde6271e0d80abe6.zip | |
merge 8.1 -> tip, multiple bugs (base)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1134 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/silent/templates')
| -rwxr-xr-x | pki/base/silent/templates/pki_silent.template | 5 | ||||
| -rwxr-xr-x | pki/base/silent/templates/subca_silent.template | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pki/base/silent/templates/pki_silent.template b/pki/base/silent/templates/pki_silent.template index 3b86a8ff4..6d9c6bda8 100755 --- a/pki/base/silent/templates/pki_silent.template +++ b/pki/base/silent/templates/pki_silent.template @@ -382,6 +382,7 @@ ca_base_dn="dc=${pki_host}-${ca_instance_name}" ca_db_name="${pki_host}-${ca_instance_name}" ca_key_size=2048 ca_key_type=rsa +ca_key_algorithm=SHA256withRSA ca_save_p12=false ca_sign_cert_subject_name="cn=Certificate\ Authority,o=${pki_security_domain_name}" ca_subsystem_cert_subject_name="cn=CA\ Subsystem\ Certificate,o=${pki_security_domain_name}" @@ -1045,6 +1046,7 @@ pkisilent ConfigureCA \ -db_name "${ca_db_name}" \ -key_size ${ca_key_size} \ -key_type ${ca_key_type} \ + -key_algorithm ${ca_key_algorithm} \ -save_p12 ${ca_save_p12} \ -subsystem_name ${ca_subsystem_name} \ -token_name ${ca_token_name} \ @@ -1110,6 +1112,7 @@ pkisilent ConfigureCA \ # -db_name "${ca_db_name}" \ # -key_size ${ca_key_size} \ # -key_type ${ca_key_type} \ +# -key_algorithm ${ca_key_algorithm} \ # -save_p12 ${ca_save_p12} \ # -subsystem_name ${ca_subsystem_name} \ # -token_name ${ca_token_name} \ @@ -1169,6 +1172,7 @@ pkisilent ConfigureCA \ # -db_name "${ca_db_name}" \ # -key_size ${ca_key_size} \ # -key_type ${ca_key_type} \ +# -key_algorithm ${ca_key_algorithm} \ # -save_p12 ${ca_save_p12} \ # -subsystem_name ${ca_subsystem_name} \ # -token_name ${ca_token_name} \ @@ -1235,6 +1239,7 @@ pkisilent ConfigureCA \ # -db_name "${ca_db_name}" \ # -key_size ${ca_key_size} \ # -key_type ${ca_key_type} \ +# -key_algorithm ${ca_key_algorithm} \ # -save_p12 ${ca_save_p12} \ # -subsystem_name ${ca_subsystem_name} \ # -token_name ${ca_token_name} \ diff --git a/pki/base/silent/templates/subca_silent.template b/pki/base/silent/templates/subca_silent.template index b1914e442..5bb27e9b0 100755 --- a/pki/base/silent/templates/subca_silent.template +++ b/pki/base/silent/templates/subca_silent.template @@ -283,6 +283,7 @@ subca_base_dn="dc=${pki_host}-${subca_instance_name}" subca_db_name="${pki_host}-${subca_instance_name}" subca_key_size=2048 subca_key_type=rsa +subca_key_algorithm=SHA256withRSA subca_sign_cert_subject_name="cn=Certificate\ Authority\ 2,o=${pki_security_domain_name}" subca_subsystem_cert_subject_name="cn=CA\ Subsystem\ Certificate\ 2,o=${pki_security_domain_name}" subca_ocsp_cert_subject_name="cn=OCSP\ Signing\ Certificate\ 2,o=${pki_security_domain_name}" @@ -480,6 +481,7 @@ pkisilent ConfigureSubCA \ -db_name "${subca_db_name}" \ -key_size ${subca_key_size} \ -key_type ${subca_key_type} \ + -key_algorithm ${subca_key_algorithm} \ -token_name ${subca_token_name} \ -token_pwd ${subca_token_password} \ -agent_key_size ${subca_agent_key_size} \ |