diff options
| author | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2011-01-14 02:31:03 +0000 |
|---|---|---|
| committer | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2011-01-14 02:31:03 +0000 |
| commit | f1d9cdf6aeaaab51c658bbba51aa5f08677e0dbc (patch) | |
| tree | dc9f9bdf28c1ea19bd88483ca839d944a972e324 | |
| parent | 51365aae4f3961b45126207423d40b61615159c4 (diff) | |
Fix Bugzilla Bug#533226 - ESC on Vista 64bit: throws 'Certificate Propagation has stopped working' when an enrolled token is inserted.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@92 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
| -rw-r--r-- | src/windows/csp/Makefile | 8 | ||||
| -rw-r--r-- | src/windows/csp/csp.cpp | 11 | ||||
| -rw-r--r-- | src/windows/csp/cspres.rc | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/windows/csp/Makefile b/src/windows/csp/Makefile index 427666c..9ff200d 100644 --- a/src/windows/csp/Makefile +++ b/src/windows/csp/Makefile @@ -27,9 +27,9 @@ DBGLCFLAGS = 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 @@ ARCH = X64 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" \ diff --git a/src/windows/csp/csp.cpp b/src/windows/csp/csp.cpp index bcbdcba..96dd55b 100644 --- a/src/windows/csp/csp.cpp +++ b/src/windows/csp/csp.cpp @@ -165,9 +165,14 @@ CPAcquireContext( 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_) { diff --git a/src/windows/csp/cspres.rc b/src/windows/csp/cspres.rc index 9d9d963..8edb4d6 100644 --- a/src/windows/csp/cspres.rc +++ b/src/windows/csp/cspres.rc @@ -135,7 +135,7 @@ END 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 |