Author: jmagne
Update of /cvs/dirsec/coolkey/src/windows/csp
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1959
Modified Files:
Makefile csp.cpp cspres.rc
Log Message:
Fix Bugzilla Bug#533226 - ESC on Vista 64bit: throws 'Certificate Propagation has
stopped working' when an enrolled token is inserted.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2 Oct 2009 01:43:53 -0000 1.2
+++ Makefile 14 Jan 2011 02:31:03 -0000 1.3
@@ -27,9 +27,9 @@
DBGFLAGS =
MTLIB = -MT
-!IF "$(BUILD_OPT)" == "1"
-DBGLCFLAGS = -ZI -DEBUG -D_DEBUG
-DBGFLAGS = /DEBUG
+!IF "$(BUILD_OPT)" != "1"
+DBGLCFLAGS = -Z7
+DBGFLAGS = /DEBUG
MTLIB = -MTd
!ENDIF
@@ -43,7 +43,7 @@
LCFLAGS=-Od -I$(CAPISDK)/sdkinc -DWIN32 -D_WINDOWS -D_USRDLL \
-D_CONSOLE -DCSP_EXPORTS -D_WINDLL -DIDA_PROMPT_PINGUI -D_MBCS \
- -EHsc -RTC1 -W3 -nologo -c $(DBGCLFLAGS) -TP
+ -EHsc -RTC1 -W3 -nologo -c $(DBGLCFLAGS) -TP
CSPRESFLAGS=/INCREMENTAL:NO /NOLOGO /DLL /DEF:"cspres.def" $(DBGFLAGS) \
/SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /IMPLIB:"cspres.lib" \
Index: csp.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/csp.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csp.cpp 2 Oct 2009 01:43:53 -0000 1.4
+++ csp.cpp 14 Jan 2011 02:31:03 -0000 1.5
@@ -165,9 +165,14 @@
context->CKAID_.HexToBin();
- LOG("Container name: \"%s\"\n",
&context->containerName_[0]);
- LOG("CKA_ID: %s \"%s\"\n",
StringifyBin(context->CKAID_).c_str(),
- StringifyBin(context->CKAID_, false).c_str());
+ if (context->containerName_.size()) {
+ LOG("Container name: \"%s\"\n",
&context->containerName_[0]);
+ }
+
+ if (context->CKAID_.size()) {
+ LOG("CKA_ID: %s \"%s\"\n",
StringifyBin(context->CKAID_).c_str(),
+ StringifyBin(context->CKAID_, false).c_str());
+ }
if (!context->silent_ && !context->verifyContext_)
{
Index: cspres.rc
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/cspres.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cspres.rc 11 Oct 2006 18:12:58 -0000 1.1
+++ cspres.rc 14 Jan 2011 02:31:03 -0000 1.2
@@ -135,7 +135,7 @@
IDD_PIN_DIALOG DIALOGEX 0, 0, 274, 103
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Please enter your PIN"
+CAPTION "COOLKEY CSP: Please enter your PIN"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,159,82,50,14,WS_DISABLED
Show replies by date