Bugzilla Bug 451874 - RFE - Java console - Certificate Wizard missing e.c. support

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

1 files changed, 30 insertions, 7 deletions

diff --git a/pki/dogtag/console-ui/CMSAdminRS.properties b/pki/dogtag/console-ui/CMSAdminRS.properties
index c51b1bbc..e4210493 100644
--- a/pki/dogtag/console-ui/CMSAdminRS.properties
+++ b/pki/dogtag/console-ui/CMSAdminRS.properties
@@ -1788,22 +1788,29 @@ KEYWIZARD_LABEL_PWD_LABEL=Password:
 KEYWIZARD_LABEL_NICKNAME_LABEL=Select a nickname as follows:
 KEYWIZARD_COMBOBOX_DSAKEYTYPE_VALUE_0=RSA
 KEYWIZARD_COMBOBOX_DSAKEYTYPE_VALUE_1=DSA
+KEYWIZARD_COMBOBOX_DSAKEYTYPE_VALUE_2=ECC
 KEYWIZARD_COMBOBOX_KEYTYPE_VALUE_0=RSA
+KEYWIZARD_COMBOBOX_KEYTYPE_VALUE_1=ECC
 KEYWIZARD_LABEL_KEYTYPE_LABEL=Key type:
 KEYWIZARD_LABEL_KEYLENGTH_LABEL=Key length:
 KEYWIZARD_COMBOBOX_KEYLENGTH_VALUE_0=1024
 KEYWIZARD_COMBOBOX_KEYLENGTH_VALUE_1=2048
 KEYWIZARD_COMBOBOX_KEYLENGTH_VALUE_2=Custom
+KEYWIZARD_LABEL_KEYCURVE_LABEL=Curve Name:
+KEYWIZARD_COMBOBOX_KEYCURVE_VALUE_0=nistp521
+KEYWIZARD_COMBOBOX_KEYCURVE_VALUE_1=Custom
 KEYWIZARD_COMBOBOX_DSAKEYLENGTH_VALUE_0=1024
 KEYWIZARD_COMBOBOX_DSAKEYLENGTH_VALUE_1=Custom
 KEYWIZARD_LABEL_UNITS_LABEL=bits
 KEYWIZARD_LABEL_KEY_LABEL=Specify the key type and key length:
 KEYWIZARD_LABEL_CUSTOMKEY_LABEL=Enter a value for the customized key length:
+KEYWIZARD_LABEL_CUSTOMKEYCURVE_LABEL=Enter a value for the customized curve name:
 KEYWIZARD_LABEL_SELECTTOKEN_LABEL=Select the token (cryptographic device) on which to generate the key pair:
 KEYWIZARD_DIALOG_CASIGNINGCERTNOTFOUND_MESSAGE=The CA signing certificate cannot be found
 KEYWIZARD_DIALOG_BLANKLEN_MESSAGE=Key length cannot be blank
 KEYWIZARD_DIALOG_NONINTEGER_MESSAGE=Key length is not an integer
 KEYWIZARD_DIALOG_INVALIDKEYLEN_MESSAGE=Invalid key length
+KEYWIZARD_DIALOG_BLANKCURVE_MESSAGE=ECC key curve name cannot be blank
 KEYWIZARD_DIALOG_NOTSAMEPASSWD_TITLE=Error
 KEYWIZARD_DIALOG_NOTSAMEPASSWD_MESSAGE=The two passwords you entered do not match
 KEYWIZARD_DIALOG_BLANKPASSWD_TITLE=Error
@@ -1883,6 +1890,7 @@ CERTTYPEWIZARD_RADIOBUTTON_SERVER_SELFSIGN_LABEL=Sign this SSL Certificate with
 CERTTYPEWIZARD_RADIOBUTTON_SERVER_SUBORDINATE_LABEL=Create a request for submission to another CA
 CERTTYPEWIZARD_RADIOBUTTON_SELFSIGNOCSP_LABEL=Sign this OCSP Certificate with my CA Signing Certificate
 CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATEOCSP_LABEL=Create a request for submission to another CA
+CERTTYPEWIZARD_DIALOG_BLANKCERTTYPE_MESSAGE=Certificate type cannot be blank
 CACERTREQUESTWIZARD_TITLE=Certificate Setup Wizard
 CACERTREQUESTWIZARD_BORDER_CACERTREQUESTWIZARD_LABEL=Generate a Certificate Request -1
 CACERTREQUESTWIZARD_LABEL_CATYPE_LABEL=1. Is this Certificate Authority a self-signed CA or a subordinate CA?
@@ -3319,13 +3327,28 @@ CERTEXTENSION1WIZARD_CHECKBOX_KEYUSAGE_LABEL=Key Usage
 CERTEXTENSION1WIZARD_DIALOG_DERBLANKFIELD_MESSAGE=Base-64 DER encoding field cannot be empty
 CERTMESSAGEDIGESTWIZARD_TITLE=Certificate Setup Wizard
 CERTMESSAGEDIGESTWIZARD_BORDER_CERTMESSAGEDIGESTWIZARD_LABEL=Message Digest Algorithm
-CERTMESSAGEDIGESTWIZARD_TEXT_HASHTYPE_LABEL=Select the hashing algorithm to use for computing the signature on this certificate:
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_0=MD2
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_1=MD5
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_2=SHA1
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_3=SHA256
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_4=SHA512
-CERTMESSAGEDIGESTWIZARD_COMBOBOX_DSAHASHTYPE_VALUE_0=SHA1
+CERTMESSAGEDIGESTWIZARD_TEXT_HASHTYPE_LABEL=Select the signing algorithm to use when signing objects with this certificate:
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_0=MD2withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_1=MD5withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_2=SHA1withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_3=SHA256withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSAHASHTYPE_VALUE_4=SHA512withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_DSAHASHTYPE_VALUE_0=SHA1withDSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCHASHTYPE_VALUE_0=SHA1withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCHASHTYPE_VALUE_1=SHA256withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCHASHTYPE_VALUE_2=SHA384withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCHASHTYPE_VALUE_3=SHA512withEC
+CERTMESSAGEDIGESTWIZARD_TEXT_SIGNEDBYTYPE_LABEL=Select the signing algorithm to use for computing the signature of this certificate:
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSASIGNEDBYTYPE_VALUE_0=MD2withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSASIGNEDBYTYPE_VALUE_1=MD5withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSASIGNEDBYTYPE_VALUE_2=SHA1withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSASIGNEDBYTYPE_VALUE_3=SHA256withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_RSASIGNEDBYTYPE_VALUE_4=SHA512withRSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_DSASIGNEDBYTYPE_VALUE_0=SHA1withDSA
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCSIGNEDBYTYPE_VALUE_0=SHA1withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCSIGNEDBYTYPE_VALUE_1=SHA256withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCSIGNEDBYTYPE_VALUE_2=SHA384withEC
+CERTMESSAGEDIGESTWIZARD_COMBOBOX_ECCSIGNEDBYTYPE_VALUE_3=SHA512withEC
 LOGGINGWIZARD_TITLE=Installation Wizard
 LOGGINGWIZARD_BORDER_LOGGINGWIZARD_LABEL=Logging
 LOGGINGWIZARD_CHECKBOX_SYSLOG_LABEL=Enable system log