|
 |
ec4b96 |
--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix5 2009-06-08 14:14:44.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp 2009-06-08 14:15:03.000000000 -0700
|
|
|
ec4b96 |
@@ -159,7 +159,7 @@
|
|
|
ec4b96 |
|
|
|
ec4b96 |
/* if we think we have a token, but it's not the right one, or it's
|
|
|
ec4b96 |
* not there, then send a removal event */
|
|
|
ec4b96 |
- if (info && (!isPresent || (info->mSeries != PK11_GetSlotSeries(slot))) ) {
|
|
|
ec4b96 |
+ if (info && !isPresent) {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
|
|
|
ec4b96 |
("%s SmartCardMonitoringThread::Execute Token Removed : \n",GetTStamp(tBuff,56)));
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul.fix5 2009-06-08 13:46:19.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/chrome/content/esc/certManager.xul 2009-06-08 13:46:33.000000000 -0700
|
|
|
ec4b96 |
@@ -59,7 +59,6 @@
|
|
|
ec4b96 |
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
|
|
|
ec4b96 |
<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
|
|
|
ec4b96 |
<script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
|
|
|
ec4b96 |
- <script type="application/x-javascript" src="escCertManager.js"/>
|
|
|
ec4b96 |
|
|
|
ec4b96 |
<vbox flex="1">
|
|
|
ec4b96 |
<tabbox id="certmanagertabs" flex="1" style="margin:5px">
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/chrome/content/esc/password.xul.fix5 2009-06-08 14:04:16.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/chrome/content/esc/password.xul 2009-06-08 14:04:29.000000000 -0700
|
|
|
ec4b96 |
@@ -23,7 +23,6 @@
|
|
|
ec4b96 |
id="esc-window"
|
|
|
ec4b96 |
title="&getESCPassword;"
|
|
|
ec4b96 |
onload="PasswordLoad();"
|
|
|
ec4b96 |
- onunload="cleanup();"
|
|
|
ec4b96 |
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
|
|
ec4b96 |
|
|
|
ec4b96 |
<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix5 2009-06-08 14:02:26.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js 2009-06-08 14:03:46.000000000 -0700
|
|
|
ec4b96 |
@@ -522,7 +522,10 @@
|
|
|
ec4b96 |
if(!string_id || !gStringBundle)
|
|
|
ec4b96 |
return null;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- str = gStringBundle.getString(string_id);
|
|
|
ec4b96 |
+ try {
|
|
|
ec4b96 |
+ str = gStringBundle.getString(string_id);
|
|
|
ec4b96 |
+ } catch(e) {
|
|
|
ec4b96 |
+ }
|
|
|
ec4b96 |
|
|
|
ec4b96 |
return str;
|
|
|
ec4b96 |
}
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/application.ini.fix5 2009-06-08 13:44:59.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/application.ini 2009-06-08 13:45:15.000000000 -0700
|
|
|
ec4b96 |
@@ -25,7 +25,7 @@
|
|
|
ec4b96 |
Name=ESC
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
; This field specifies your application's version. This field is optional.
|
|
|
ec4b96 |
-Version=1.1.0-6
|
|
|
ec4b96 |
+Version=1.1.0-7
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
; This field specifies your application's build ID (timestamp). This field is
|
|
|
ec4b96 |
; required.
|
|
|
ec4b96 |
--- ./esc/win32/setup.iss.fix5 2009-06-08 14:16:04.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/win32/setup.iss 2009-06-08 14:16:26.000000000 -0700
|
|
|
ec4b96 |
@@ -4,43 +4,31 @@
|
|
|
ec4b96 |
[Setup]
|
|
|
ec4b96 |
AppName=Smart Card Manager
|
|
|
ec4b96 |
AppMutex=ESCMutex
|
|
|
ec4b96 |
-AppVerName=Smart Card Manager 1.1.0-3
|
|
|
ec4b96 |
-AppPublisher=Red Hat, Inc.
|
|
|
ec4b96 |
+AppVerName=Smart Card Manager 1.1.0-6
|
|
|
ec4b96 |
+AppPublisher=Fedora
|
|
|
ec4b96 |
CreateAppDir=true
|
|
|
ec4b96 |
Compression=lzma
|
|
|
ec4b96 |
SolidCompression=true
|
|
|
ec4b96 |
MinVersion=0,5.0.2195
|
|
|
ec4b96 |
ShowLanguageDialog=yes
|
|
|
ec4b96 |
-OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386
|
|
|
ec4b96 |
-DefaultDirName={pf}\Red Hat\ESC
|
|
|
ec4b96 |
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-6.win32.i386
|
|
|
ec4b96 |
+DefaultDirName={pf}\Fedora\ESC
|
|
|
ec4b96 |
DisableProgramGroupPage=false
|
|
|
ec4b96 |
-DefaultGroupName=Red Hat
|
|
|
ec4b96 |
+DefaultGroupName=Fedora
|
|
|
ec4b96 |
SetupIconFile=BUILD\ESC\components\esc.ico
|
|
|
ec4b96 |
UninstallDisplayIcon={app}\components\esc.ico
|
|
|
ec4b96 |
-WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
|
|
|
ec4b96 |
+;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
|
|
|
ec4b96 |
+WizardImageFile=esc-image-large.bmp
|
|
|
ec4b96 |
WizardSmallImageFile=BUILD\ESC\components\esc.bmp
|
|
|
ec4b96 |
AllowNoIcons=yes
|
|
|
ec4b96 |
LicenseFile=esc-license.txt
|
|
|
ec4b96 |
InfoBeforeFile=info-before.txt
|
|
|
ec4b96 |
InfoAfterFile=info-after.txt
|
|
|
ec4b96 |
PrivilegesRequired=admin
|
|
|
ec4b96 |
-VersionInfoVersion=1.1.0.3
|
|
|
ec4b96 |
+VersionInfoVersion=1.1.0.6
|
|
|
ec4b96 |
|
|
|
ec4b96 |
|
|
|
ec4b96 |
[Files]
|
|
|
ec4b96 |
-Source: BUILD\egate\slbmgpg.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egate.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egate.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egate.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egate_License.txt; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egatebus.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egatebus.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egatebus.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egaterdr.cat; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egaterdr.inf; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
|
|
|
ec4b96 |
-Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion
|
|
|
ec4b96 |
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
|
|
|
ec4b96 |
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
|
|
|
ec4b96 |
Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
@@ -73,7 +61,6 @@
|
|
|
ec4b96 |
Source: BUILD\ESC\application.ini; DestDir: {app}
|
|
|
ec4b96 |
Source: BUILD\ESC\chrome\chrome.manifest; DestDir: {app}\chrome
|
|
|
ec4b96 |
Source: BUILD\ESC\chrome\content\esc\TRAY.js; DestDir: {app}\chrome\content\esc
|
|
|
ec4b96 |
-Source: BUILD\ESC\chrome\content\esc\CertInfo.js; DestDir: {app}\chrome\content\esc
|
|
|
ec4b96 |
;Source: BUILD\ESC\chrome\content\esc\certinfo.xul; DestDir: {app}\chrome\content\esc
|
|
|
ec4b96 |
Source: BUILD\ESC\chrome\content\esc\config.xul; DestDir: {app}\chrome\content\esc
|
|
|
ec4b96 |
Source: BUILD\ESC\chrome\content\esc\contents.rdf; DestDir: {app}\chrome\content\esc
|
|
|
ec4b96 |
@@ -110,19 +97,18 @@
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
+Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
+Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
+Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
+Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner
|
|
|
ec4b96 |
@@ -413,9 +399,6 @@
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir: {app}\xulrunner\res\fonts
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
-Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries
|
|
|
ec4b96 |
Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules
|
|
|
ec4b96 |
@@ -429,7 +412,6 @@
|
|
|
ec4b96 |
|
|
|
ec4b96 |
[Run]
|
|
|
ec4b96 |
|
|
|
ec4b96 |
-Filename: {win}\egate2.4\eginstall.exe; Parameters: -f -l eginstall.txt; WorkingDir: {win}\egate2.4; Flags: waituntilterminated; StatusMsg: Installing smart card drivers....
|
|
|
ec4b96 |
Filename: {app}\PKCS11\pk11install.exe; Parameters: "-v ""name='CoolKey Module' library=coolkeypk11.dll NSS=""slotParams={{0x1=[slotFlags=PublicCerts]}"""""; WorkingDir: {sys}; StatusMsg: Configuring System for smart cards...
|
|
|
ec4b96 |
Filename: {app}\xulrunner\xulrunner.exe; Parameters: """--register-global"""
|
|
|
ec4b96 |
Filename: {app}\esc.exe; WorkingDir: {app}; StatusMsg: {code:GetEscStatusMsg}; Flags: nowait
|
|
|
ec4b96 |
@@ -450,12 +432,18 @@
|
|
|
ec4b96 |
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
|
|
|
ec4b96 |
|
|
|
ec4b96 |
; Now register the Gemalto 64K V2
|
|
|
ec4b96 |
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask: ValueData: ff ff ff ff ff ff ff ff ff ff; Flags: uninsdeletekey
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey
|
|
|
ec4b96 |
|
|
|
ec4b96 |
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
|
|
|
ec4b96 |
|
|
|
ec4b96 |
-Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64 V2: ValueType: binary; ValueName: ATR; ValueData: 3b 95 95 40 ff ae 01 03 00 00
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00
|
|
|
ec4b96 |
|
|
|
ec4b96 |
+; Now register the Safenet 330J
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
|
|
|
ec4b96 |
|
|
|
ec4b96 |
Root: HKLM; Subkey: Software\
|
|
|
ec4b96 |
; Turn off the "pick a cert" dialog box
|
|
|
ec4b96 |
--- ./esc/win32/build.sh.fix5 2009-06-08 14:15:58.000000000 -0700
|
|
|
ec4b96 |
+++ ./esc/win32/build.sh 2009-06-08 14:16:33.000000000 -0700
|
|
|
ec4b96 |
@@ -37,6 +37,8 @@
|
|
|
ec4b96 |
NSS_ARCHIVE=$NSS_NAME-with-nspr-4.6.4
|
|
|
ec4b96 |
NSS_SOURCE_URL=https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$NSS_ARCHIVE.tar.gz
|
|
|
ec4b96 |
|
|
|
ec4b96 |
+NSS_LIB_PATH=$NSS_NAME/mozilla/dist/WIN*/lib
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
#Inno installer values
|
|
|
ec4b96 |
|
|
|
ec4b96 |
#INNO_PATH="C:/Program Files/Inno Setup 5/ISCC.exe"
|
|
|
ec4b96 |
@@ -76,7 +78,7 @@
|
|
|
ec4b96 |
#ESC values
|
|
|
ec4b96 |
|
|
|
ec4b96 |
ESC_NAME=esc
|
|
|
ec4b96 |
-ESC_VERSION_NO=1.1.0-3
|
|
|
ec4b96 |
+ESC_VERSION_NO=1.1.0-6
|
|
|
ec4b96 |
|
|
|
ec4b96 |
|
|
|
ec4b96 |
#Cygwin values
|
|
|
ec4b96 |
@@ -462,6 +464,15 @@
|
|
|
ec4b96 |
|
|
|
ec4b96 |
cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
|
|
|
ec4b96 |
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
+ #Transport the nss files needed for pk11install.exe
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
+ cp $NSS_LIB_PATH/softokn3.dll BUILD
|
|
|
ec4b96 |
+ cp $NSS_LIB_PATH/libplc4.dll BUILD
|
|
|
ec4b96 |
+ cp $NSS_LIB_PATH/libnspr4.dll BUILD
|
|
|
ec4b96 |
+ cp $NSS_LIB_PATH/libplds4.dll BUILD
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
+
|
|
|
ec4b96 |
# Build the INNO executable installer
|
|
|
ec4b96 |
|
|
|
ec4b96 |
"$INNO_PATH" setup.iss
|