[openca-cvsdev] CVS: openca-0.9/src/web-interfaces/pub/i18n/C/sheets ie_confirm.html,1.1,1.2

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/web-interfaces/pub/i18n/C/sheets
In directory usw-pr-cvs1:/tmp/cvs-serv16237/pub/i18n/C/sheets

Modified Files:
	ie_confirm.html 
Log Message:
fixed for microsoft ie-bugfix


Index: ie_confirm.html
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/web-interfaces/pub/i18n/C/sheets/ie_confirm.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ie_confirm.html	24 Sep 2002 11:53:19 -0000	1.1
--- ie_confirm.html	30 Sep 2002 14:17:19 -0000	1.2
***************
*** 10,14 ****
          classid="clsid:43f8f289-7a20-11d0-8f06-00c04fc295e1"
          codebase=xenroll.dll
!         id=certHelper>
      </object>
  
--- 10,19 ----
          classid="clsid:43f8f289-7a20-11d0-8f06-00c04fc295e1"
          codebase=xenroll.dll
!         id=certHelperOld>
!     </object>
!     <object
!         classid= "clsid:127698e4-e730-4e5c-a2b1-21490a70c8a1"
!         codebase=xenroll.dll
!         id=certHelperNew>
      </object>
  
***************
*** 16,21 ****
--- 21,45 ----
  
          dim PROV_RSA_FULL
+         dim OLD_XENROLL
+         dim NEW_XENROLL
  
          PROV_RSA_FULL = 1
+         OLD_XENROLL   = 0
+         NEW_XENROLL   = 1
+ 
+         Function getXEnroll
+             dim tester
+ 
+             tester = certHelperOld.MyStoreName
+             if Len (tester) > 0 then
+                 getXEnroll = OLD_XENROLL
+                 MsgBox ("You are using an old Internet Explorer with a security bug in XEnroll.dll (MS02-48).")
+             end if
+ 
+             tester = certHelperNew.MyStoreName
+             if Len (tester) > 0 then
+                 getXEnroll = NEW_XENROLL
+             end if
+         End Function
  
          Function getComma (dn)
***************
*** 59,72 ****
              dim szName
              dim sz10
  
              On Error Resume Next
              set theForm = document.GenReqForm
  
              name = theForm.csp.options(document.GenReqForm.csp.selectedIndex).value
              if Len(name) > 0 then
!                 certHelper.ProviderName=name
!                 MsgBox ("The used Cryptographic Service Provider is " & certHelper.ProviderName)
              else
!                 certHelper.ProviderName=""
                  MsgBox ("The used Cryptographic Service Provider is the default one.")
              end if
--- 83,108 ----
              dim szName
              dim sz10
+             dim xenroll
  
              On Error Resume Next
              set theForm = document.GenReqForm
  
+             xenroll = getXEnroll
+ 
              name = theForm.csp.options(document.GenReqForm.csp.selectedIndex).value
              if Len(name) > 0 then
!                 if xenroll = OLD_XENROLL then
!                     certHelperOld.ProviderName=name
!                     MsgBox ("The used Cryptographic Service Provider is " & certHelperOld.ProviderName)
!                 else
!                     certHelperNew.ProviderName=name
!                     MsgBox ("The used Cryptographic Service Provider is " & certHelperNew.ProviderName)
!                 end if
              else
!                 if xenroll = OLD_XENROLL then
!                     certHelperOld.ProviderName=""
!                 else
!                     certHelperNew.ProviderName=""
!                 end if
                  MsgBox ("The used Cryptographic Service Provider is the default one.")
              end if
***************
*** 106,112 ****
              Msgbox ("DN is " & szName)
      
!             certHelper.providerType = PROV_RSA_FULL
!             certHelper.HashAlgorithm = "SHA1"
!             certHelper.KeySpec = 1
              ' certHelper.GenKeyFlags
              '                        0x0400     keylength (first 16 bit) => 1024
--- 142,159 ----
              Msgbox ("DN is " & szName)
      
!             if xenroll = OLD_XENROLL then
!                 certHelperOld.providerType = PROV_RSA_FULL
!                 certHelperOld.HashAlgorithm = "SHA1"
!                 certHelperOld.KeySpec = 1
!                 certHelperOld.GenKeyFlags = 67108867
!                 sz10 = certHelperOld.CreatePKCS10(szName, "1.3.6.1.4.1.311.2.1.21")
!             else
!                 certHelperNew.providerType = PROV_RSA_FULL
!                 certHelperNew.HashAlgorithm = "SHA1"
!                 certHelperNew.KeySpec = 1
!                 certHelperNew.GenKeyFlags = 67108867
!                 sz10 = certHelperNew.CreatePKCS10(szName, "1.3.6.1.4.1.311.2.1.21")
!             end if
! 
              ' certHelper.GenKeyFlags
              '                        0x0400     keylength (first 16 bit) => 1024
***************
*** 114,127 ****
              '                        0x00000002 CRYPT_USER_PROTECTED
              '                        0x04000003
-             certHelper.GenKeyFlags = 67108867
              '                        0x0200     => this works for some export-restricted browsers (512 bit)
              '                        0x02000003
              '                        33554435
  
-             sz10 = certHelper.CreatePKCS10(szName, "1.3.6.1.4.1.311.2.1.21")
- 
              if Len(sz10) = 0 then 
!                 certHelper.GenKeyFlags = 67108866
!                 sz10 = certHelper.CreatePKCS10(dn, "1.3.6.1.4.1.311.2.1.21")
  
                  if Len(theForm.asn1.value) = 0 then 
--- 161,176 ----
              '                        0x00000002 CRYPT_USER_PROTECTED
              '                        0x04000003
              '                        0x0200     => this works for some export-restricted browsers (512 bit)
              '                        0x02000003
              '                        33554435
  
              if Len(sz10) = 0 then 
!                 if xenroll = OLD_XENROLL then
!                     certHelperOld.GenKeyFlags = 67108866
!                     sz10 = certHelperOld.CreatePKCS10(dn, "1.3.6.1.4.1.311.2.1.21")
!                 else
!                     certHelperNew.GenKeyFlags = 67108866
!                     sz10 = certHelperNew.CreatePKCS10(dn, "1.3.6.1.4.1.311.2.1.21")
!                 end if
  
                  if Len(theForm.asn1.value) = 0 then 
***************
*** 148,154 ****
--- 197,206 ----
              dim name
              dim element
+             dim xenroll
  
              On Error Resume Next
  
+             xenroll = getXEnroll
+ 
              prov=0
              document.GenReqForm.csp.selectedIndex = 0
***************
*** 156,160 ****
              do
                  name = ""
!                 name = certHelper.enumProviders(prov,0)
                  if Len (name) = 0 then
                      exit do
--- 208,216 ----
              do
                  name = ""
!                 if xenroll = OLD_XENROLL then
!                     name = certHelperOld.enumProviders(prov,0)
!                 else
!                     name = certHelperNew.enumProviders(prov,0)
!                 end if
                  if Len (name) = 0 then
                      exit do