From rcritten at fedoraproject.org Wed Nov 11 18:20:42 2009 From: rcritten at fedoraproject.org (rcritten) Date: Wed, 11 Nov 2009 18:20:42 +0000 (UTC) Subject: [389-commits] mod_nss nss_engine_io.c,1.9,1.10 Message-ID: <20091111182042.9695011C04A2@cvs1.fedora.phx.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20830 Modified Files: nss_engine_io.c Log Message: Fix another place we should set PR_WOULD_BLOCK_ERROR during a read. Index: nss_engine_io.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_io.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nss_engine_io.c 19 Feb 2009 02:31:18 -0000 1.9 +++ nss_engine_io.c 11 Nov 2009 18:20:39 -0000 1.10 @@ -278,6 +278,7 @@ if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)) { + PR_SetError(PR_WOULD_BLOCK_ERROR, 0); return (int)inl; } From jmagne at fedoraproject.org Tue Nov 17 22:55:23 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Tue, 17 Nov 2009 22:55:23 +0000 (UTC) Subject: [389-commits] esc/win32 build.sh,1.11.2.3,1.11.2.4 Message-ID: <20091117225523.7441711C02A2@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20693 Modified Files: Tag: PKI_8_0_RTM_BRANCH build.sh Log Message: Bump versions. Index: build.sh =================================================================== RCS file: /cvs/dirsec/esc/win32/build.sh,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -r1.11.2.3 -r1.11.2.4 --- build.sh 9 Oct 2009 01:14:43 -0000 1.11.2.3 +++ build.sh 17 Nov 2009 22:55:20 -0000 1.11.2.4 @@ -85,7 +85,9 @@ #ESC values ESC_NAME=esc -ESC_VERSION_NO=1.1.0-8 +ESC_VERSION_NO=1.1.0-9 +ESC_TAG=PKI_8_0_RTM_BRANCH + #Cygwin values @@ -110,7 +112,7 @@ echo "BUILDING NSS..." - if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ $USE_64 == 1 ]; + if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ X$USE_64 == X1 ]; then echo "Do not build NSS." return 0 @@ -189,7 +191,7 @@ ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib - if [ $USE_64 == 1 ]; + if [ X$USE_64 == X1 ]; then ZLIB_LIB_PATH=${BASE_DIR}/zlib/dll_x64 ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/dll_x64/$ZLIB_DLL_64.dll @@ -212,7 +214,7 @@ export ZLIB_LIB=$ZLIB_LIB_PATH export ZLIB_INCLUDE=$ZLIB_INC_PATH - if [ $USE_64 == 1 ]; + if [ X$USE_64 == X1 ]; then PK11= else @@ -245,7 +247,7 @@ cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD - if [ $USE_64 == 1 ]; + if [ X$USE_64 == X1 ]; then cp -f zlib/dll_x64/zlibwapi.dll BUILD else @@ -255,7 +257,7 @@ # Grab pk11install - if [ $USE_64 != 1 ]; + if [ X$USE_64 != X1 ]; then cp -f coolkey/src/install/pk11install.exe BUILD fi @@ -280,7 +282,7 @@ cd $ZLIB_NAME - if [ $USE_64 == 1 ] + if [ X$USE_64 == X1 ] then wget $ZLIB_BIN_URL_64/$ZLIB_ARCHIVE_64.zip @@ -328,7 +330,7 @@ echo "BUILDING ESC" cd $BASE_DIR - if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ $USE_64 == 1 ]; + if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ X$USE_64 == X1 ]; then echo "Do not build ESC." return 0 @@ -338,7 +340,7 @@ then echo "ESC already checked out.." else - cvs -d $FEDORA_CVS_ROOT co esc + cvs -d $FEDORA_CVS_ROOT -r $ESC_TAG co esc fi if [ $? != 0 ]; @@ -364,10 +366,14 @@ CKY_INCLUDE_PATH=`cygpath -m $CKY_INCLUDE_PATH` cd ../.. + + echo 'CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs USE_XUL_SDK=1 ESC_VERSION=$ESC_VERSION_NO"' + make BUILD_OPT=1 import make BUILD_OPT=1 CKY_INCLUDE="-I$ZLIB_INC_PATH -I$CKY_INCLUDE_PATH" CKY_LIB_LDD=$CKY_INCLUDE_PATH/.libs USE_XUL_SDK=1 ESC_VERSION=$ESC_VERSION_NO + if [ $? != 0 ]; then echo "Can't make ESC." @@ -516,7 +522,7 @@ #Move over extra files we don't keep in the open source world - if [ $USE_64 == 1 ]; + if [ X$USE_64 == X1 ]; then INNO_SCRIPT=coolkey-64.iss else From jmagne at fedoraproject.org Tue Nov 17 23:13:20 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Tue, 17 Nov 2009 23:13:20 +0000 (UTC) Subject: [389-commits] esc/win32 build.sh,1.11.2.4,1.11.2.5 Message-ID: <20091117231320.92DA511C02A2@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/win32 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25148 Modified Files: Tag: PKI_8_0_RTM_BRANCH build.sh Log Message: Fix typo. Index: build.sh =================================================================== RCS file: /cvs/dirsec/esc/win32/build.sh,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -u -r1.11.2.4 -r1.11.2.5 --- build.sh 17 Nov 2009 22:55:20 -0000 1.11.2.4 +++ build.sh 17 Nov 2009 23:13:17 -0000 1.11.2.5 @@ -340,7 +340,7 @@ then echo "ESC already checked out.." else - cvs -d $FEDORA_CVS_ROOT -r $ESC_TAG co esc + cvs -d $FEDORA_CVS_ROOT co -r $ESC_TAG esc fi if [ $? != 0 ]; From jmagne at fedoraproject.org Tue Nov 17 23:30:31 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Tue, 17 Nov 2009 23:30:31 +0000 (UTC) Subject: [389-commits] esc/src/app/xul/esc application.ini,1.9,1.9.2.1 Message-ID: <20091117233031.2B41211C04B2@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30735 Modified Files: Tag: PKI_8_0_RTM_BRANCH application.ini Log Message: Bump version. Index: application.ini =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- application.ini 13 Jun 2009 23:44:51 -0000 1.9 +++ application.ini 17 Nov 2009 23:30:28 -0000 1.9.2.1 @@ -25,7 +25,7 @@ Name=ESC ; ; This field specifies your application's version. This field is optional. -Version=1.1.0-7 +Version=1.1.0-9 ; ; This field specifies your application's build ID (timestamp). This field is ; required. From jmagne at fedoraproject.org Tue Nov 17 23:33:13 2009 From: jmagne at fedoraproject.org (Jack Magne) Date: Tue, 17 Nov 2009 23:33:13 +0000 (UTC) Subject: [389-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.24, 1.24.2.1 esc.css, 1.6, 1.6.2.1 esc.xul, 1.6, 1.6.2.1 Message-ID: <20091117233314.103B711C02A2@cvs1.fedora.phx.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31671/chrome/content/esc Modified Files: Tag: PKI_8_0_RTM_BRANCH ESC.js esc.css esc.xul Log Message: Bug 530482 - esc 1.1.0-8 WinXP tps 8.0 - no rendering in Smart Cart Enrollment window . Index: ESC.js =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- ESC.js 7 Jun 2009 00:09:15 -0000 1.24 +++ ESC.js 17 Nov 2009 23:33:11 -0000 1.24.2.1 @@ -29,7 +29,6 @@ var gFactoryMode = 0; var gHiddenPage = 0; var gExternalUI = 0; - loadStringBundle(); //ESC constants @@ -1279,7 +1278,8 @@ } else { - UpdateEnrollmentArea(keyType,keyID,keyInserted,showFullUI); + MyAlert(getBundleString("errorPhoneHomeInfo")); + window.close(); } } @@ -3260,10 +3260,74 @@ window.resizeBy(0,1); window.resizeBy(0,-1); } +// nsIWebProgressListener to oversee the loading of the external UI +var uiListener = null; +var esc_enroll_uri = null; + +const STATE_START = Components.interfaces.nsIWebProgressListener.STATE_START; +const STATE_STOP = Components.interfaces.nsIWebProgressListener.STATE_STOP; +const STATE_IS_DOCUMENT = Components.interfaces.nsIWebProgressListener.STATE_IS_DOCUMENT; +uiListener = +{ + QueryInterface: function(aIID) + { + if (aIID.equals(Components.interfaces.nsIWebProgressListener) || + aIID.equals(Components.interfaces.nsISupportsWeakReference) || + aIID.equals(Components.interfaces.nsISupports)) + return this; + throw Components.results.NS_NOINTERFACE; + }, + + onStateChange: function(aWebProgress, aRequest, aFlag, aStatus) + { + if(aFlag & STATE_START && aFlag & STATE_IS_DOCUMENT) + { + } + if(aFlag & STATE_STOP && aFlag & STATE_IS_DOCUMENT) + { + + var url = aWebProgress.DOMWindow.document.URL; + + if(url != esc_enroll_uri) + { + MyAlert(getBundleString("errorEnrollmentUI")); + + if(uiListener) + aWebProgress.removeProgressListener(uiListener); + + var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW); + + if(enrollWnd) + { + enrollWnd.close(); + } + } + else + { + if(uiListener) + aWebProgress.removeProgressListener(uiListener); + } + } + }, + + onLocationChange: function(aProgress, aRequest, aURI) + { + }, + onProgressChange: function(aWebProgress, aRequest, curSelf, maxSelf, curTot, maxTot) + { + }, + onStatusChange: function(aWebProgress, aRequest, aStatus, aMessage) + { + }, + onSecurityChange: function(aWebProgress, aRequest, aState) + { + } +} function loadExternalESCUI() { - var esc_enroll_uri = null; + + esc_enroll_uri = null; var keyType= null; var keyID = null; @@ -3285,7 +3349,6 @@ } var esc_enrolled_token_url = null; - var esc_enroll_uri = null; if(keyID) { @@ -3323,8 +3386,9 @@ if(ui_id) { + UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI); + ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); ui_id.setAttribute("src",esc_enroll_uri); - UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI) } } Index: esc.css =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- esc.css 26 Feb 2009 22:34:43 -0000 1.6 +++ esc.css 17 Nov 2009 23:33:11 -0000 1.6.2.1 @@ -334,6 +334,10 @@ border: black solid 4px; } +.BorderedBrowser { + border: black solid 4px; +} + .SelectedRow { color: white; Index: esc.xul =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.xul,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- esc.xul 7 May 2007 23:49:23 -0000 1.6 +++ esc.xul 17 Nov 2009 23:33:11 -0000 1.6.2.1 @@ -147,7 +147,7 @@ -