Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4453
Modified Files:
CoolKeyCSP.cpp Makefile.sdk
Log Message:
Fix Bugzilla Bug 531089 - Feature: ESC on WinXP 64 bit throws dialog 'Please enter
pin' at the end of enrollment.
Index: CoolKeyCSP.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/CoolKeyCSP.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoolKeyCSP.cpp 29 Mar 2009 00:51:08 -0000 1.4
+++ CoolKeyCSP.cpp 1 Dec 2010 00:59:13 -0000 1.5
@@ -47,7 +47,7 @@
{
CryptAcquireContext(&CoolKeyCSPKeyListener::mCryptProv, NULL,
- OPENKEY_PROV, PROV_RSA_FULL,NULL);
+ OPENKEY_PROV, PROV_RSA_FULL, CRYPT_SILENT);
}
@@ -432,7 +432,7 @@
{
if(CryptAcquireContext(&CoolKeyCSPKeyListener::mCryptProv, szContainer,
- OPENKEY_PROV, PROV_RSA_FULL,0))
+ OPENKEY_PROV, PROV_RSA_FULL, CRYPT_SILENT))
{
PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::PropCerts:
about to call PropCertsInContainer %s \n",szContainer));
PropCertsInContainer(aKey->mKeyID, szContainer, hCertStore);
Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.sdk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.sdk 17 Mar 2010 00:43:51 -0000 1.5
+++ Makefile.sdk 1 Dec 2010 00:59:14 -0000 1.6
@@ -61,6 +61,7 @@
GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/sdk/include
GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin
XUL_FRAMEWORK_BIN_PATH=$(GECKO_BIN_PATH)
+XUL_RUNTIME_PATH=$(GECKO_SDK_PATH)/../xulrunner
endif
@@ -260,7 +261,7 @@
endif
ifeq ($(OS_ARCH),WINNT)
mkdir -p $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc/xulrunner
- cp -rf $(XUL_FRAMEWORK_BIN_PATH)/*
$(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc/xulrunner
+ cp -rf $(XUL_RUNTIME_PATH)/* $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc/xulrunner
endif
ifdef DESTDIR
$(NSINSTALL) $(DEPLOY_OBJDIR) $(DESTDIR)
Show replies by date