Fix update for bugzilla bug #490551

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

1 files changed, 10 insertions, 3 deletions

diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
index cc029b6ab..f35081cd3 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
@@ -237,8 +237,13 @@ Sub Send_OnClick
   Dim options
   Dim osVersion
   Dim result
+  Dim keyLen
+  Dim keyIndex
   Set TheForm = Document.ReqForm
 
+  keyIndex = TheForm.all.keyLength.options.selectedIndex
+  keyLen = CInt (TheForm.all.keyLength.options(keyIndex).value)
+
   osVersion = GetOSVersion()
 
   If osVersion <> 6 Then 'Not Vista
@@ -261,7 +266,8 @@ Sub Send_OnClick
    ' asking what level of protection you would like to give
    ' the key - this varies from 'none' to 'confirm password
    ' every time the key is used'
-  Enroll.GenKeyFlags = 1        ' key PKCS12-exportable
+   ' Enroll.GenKeyFlags = 1        ' key PKCS12-exportable
+  Enroll.GenKeyFlags = (65536 * (CLng(keyLen))) + 1
   szCertReq = Enroll.createPKCS10(szName, "1.3.6.1.5.5.7.3.2")
   theError = Err.Number
   On Error Goto 0
@@ -331,8 +337,9 @@ Sub Send_OnClick
   ' Pick the provider that is selected
     set options = TheForm.all.cryptprovider.options
     index = options.selectedIndex
-    privateKey.ProviderType=  index
+    privateKey.ProviderType = index
     privateKey.ProviderName = options(index).text
+    privateKey.Length = keyLen
 
     szName = "0.9.2342.19200300.100.1.1=" & TheForm.uid.Value & ",E=" & TheForm.email.Value & ",CN=" & TheForm.cn.Value
 
@@ -473,7 +480,7 @@ for (var j = 0; j < inputPluginListSet.length; j++) {
     } else if (inputListSet[i].inputSyntax == 'keygen_request') {
       if (navigator.appName == "Microsoft Internet Explorer") { 
         document.writeln('<input type=hidden name=' + inputListSet[i].inputId + '>');
-        document.writeln('<SELECT NAME=\"cryptprovider\"></SELECT>');
+        document.writeln('<SELECT NAME="keyLength">'+keyOptions("")+'</SELECT>&nbsp;&nbsp;<SELECT NAME=\"cryptprovider\"></SELECT>');
       } else if (typeof(crypto.version) != "undefined") {
         document.write('<SELECT NAME="keyLength">'+keyOptions("")+'</SELECT> (Encryption and Signing)');
         document.writeln('<input type=hidden name=cert_request value="">');