diff --git a/esc-1.1.0-fix15.patch b/esc-1.1.0-fix15.patch
new file mode 100755
index 0000000..40e92c7
--- /dev/null
+++ b/esc-1.1.0-fix15.patch
@@ -0,0 +1,724 @@
+diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix15 ./esc/src/app/xpcom/rhCoolKey.cpp
+--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix15	2012-11-26 14:34:39.963604936 -0800
++++ ./esc/src/app/xpcom/rhCoolKey.cpp	2012-11-26 14:34:57.012934189 -0800
+@@ -16,6 +16,7 @@
+  * END COPYRIGHT BLOCK **/
+ 
+ #define FORCE_PR_LOG 1
++#define nsnull NULL
+ #include <stdio.h>
+ #include "rhCoolKey.h"
+ #include "CoolKey.h"
+diff -up ./esc/src/app/xpcom/rhICoolKey.idl.fix15 ./esc/src/app/xpcom/rhICoolKey.idl
+--- ./esc/src/app/xpcom/rhICoolKey.idl.fix15	2012-11-26 14:33:41.730480795 -0800
++++ ./esc/src/app/xpcom/rhICoolKey.idl	2012-11-26 14:34:08.479996487 -0800
+@@ -48,11 +48,11 @@ interface rhICoolKey:nsISupports
+ 
+     void CancelCoolKeyOperation(in unsigned long aKeyType, in string aKeyID);
+ 
+-    void GetAvailableCoolKeys(out PRUint32 count,
++    void GetAvailableCoolKeys(out uint32_t count,
+                      [retval, array, size_is(count)] out string str);
+ 
+      void GetCoolKeyCertNicknames(in unsigned long aKeyType, in string aKeyID,
+-      out PRUint32 count, [retval, array, size_is(count)] out string str);
++      out uint32_t count, [retval, array, size_is(count)] out string str);
+ 
+     
+     unsigned long GetCoolKeyStatus(in unsigned long  aKeyType,in string aKeyID);
+diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix15 ./esc/src/app/xpcom/tray/Makefile.sdk
+--- ./esc/src/app/xpcom/tray/Makefile.sdk.fix15	2012-11-21 11:55:24.396959829 -0800
++++ ./esc/src/app/xpcom/tray/Makefile.sdk	2012-11-21 11:55:35.227171392 -0800
+@@ -248,7 +248,7 @@ ifeq ($(OS_ARCH),Linux)
+ 
+ 	$(CXX)   $(CPPFLAGS) -shared -o $(TARGET) $(OBJECT)  $(GECKO_DEFINES) $(GECKO_INCLUDES)  $(GECKO_LDFLAGS) $(COOLKEY_LIBS) 
+ 	chmod +x $(TARGET)
+-	strip $(TARGET)
++	#strip $(TARGET)
+ endif
+ 
+ ifeq ($(OS_ARCH),WINNT)
+diff -up ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix15 ./esc/src/app/xpcom/tray/rhLinuxTray.cpp
+--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix15	2012-11-21 11:56:16.677981170 -0800
++++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp	2012-11-26 14:26:03.793664849 -0800
+@@ -290,7 +290,7 @@ HRESULT rhTray::Initialize()
+ 
+     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize  \n",GetTStamp(tBuff,56)));
+     g_set_print_handler(rhTray::TrayPrintHandler);
+-    notify_icon_create_with_image_file(COOLKEY_ICON);
++    notify_icon_create_with_image_file((char *)COOLKEY_ICON);
+  
+     HRESULT res = notify_icon_created_ok(); 
+ 
+@@ -690,7 +690,7 @@ rhITrayWindNotify* rhTray::GetTrayWindNo
+ 
+     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
+ 
+-    return nsnull;
++    return NULL;
+ }
+ 
+ int rhTray::GetTrayWindNotifyListSize()
+diff -up ./esc/src/app/xpcom/tray/rhTray.h.fix15 ./esc/src/app/xpcom/tray/rhTray.h
+--- ./esc/src/app/xpcom/tray/rhTray.h.fix15	2012-11-21 11:57:47.827762126 -0800
++++ ./esc/src/app/xpcom/tray/rhTray.h	2012-11-21 11:57:58.304966858 -0800
+@@ -37,7 +37,7 @@ extern "C" {
+         int maxSize = 55;
+         if(aSize < maxSize)
+             return NULL;
+-        char *tFormat = "[%c]";
++        char *tFormat = (char *) "[%c]";
+         time_t tm = time(NULL);
+         struct tm *ptr = localtime(&tm);
+         strftime(aTime ,maxSize ,tFormat,ptr);
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul
+--- ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul.fix15	2012-11-21 14:23:47.146114600 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul	2012-11-21 14:24:57.057408644 -0800
+@@ -22,6 +22,9 @@
+ <window
+     class="escwindow"
+     id="esc-window"
++    height="500"
++    width="600"
++    persist="width height"
+     onload="ShowAdvancedInfo();"
+     onunload="cleanup();"
+     title="&escTitle;"
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/config.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/config.xul
+--- ./esc/src/app/xul/esc/chrome/content/esc/config.xul.fix15	2012-11-21 14:25:17.956795502 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/config.xul	2012-11-21 14:25:53.737457832 -0800
+@@ -26,6 +26,7 @@
+     onload="InitializePhoneHomeConfigUI();"
+     width ="650"
+     height= "400"
++    persist="width height"
+     onunload="cleanup();"
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/esc.css.fix15 ./esc/src/app/xul/esc/chrome/content/esc/esc.css
+--- ./esc/src/app/xul/esc/chrome/content/esc/esc.css.fix15	2012-11-21 14:26:08.849737580 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/esc.css	2012-11-21 14:27:06.947813071 -0800
+@@ -334,6 +334,10 @@ tr [COOLKeyPresent="yes"]{
+    border: black solid 4px;
+ }
+ 
++.BorderedBrowser {
++    border: black solid 4px;
++}
++
+ .SelectedRow {
+ 
+     color: white;
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix15 ./esc/src/app/xul/esc/chrome/content/esc/ESC.js
+--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix15	2012-11-20 16:10:36.281805678 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2012-11-21 14:55:47.392037184 -0800
+@@ -29,6 +29,7 @@ var gAdminPage = 0;
+ var gFactoryMode = 0;
+ var gHiddenPage = 0;
+ var gExternalUI = 0;
++var gErrorAlready = 0;
+ 
+ loadStringBundle();
+ 
+@@ -116,9 +117,10 @@ jsNotify.prototype = {
+   {
+      //  alert("iid: " + iid); 
+      if(!iid.equals(Components.interfaces.rhIKeyNotify) &&
+-         !iid.equals(Components.interfaces.nsISupports))
++         !iid.equals(Components.interfaces.nsISupports) &&
++         !iid.equals(Components.interfaces.nsIClassInfo))
+       {
+-          //MyAlert(getBundleString("errorJsNotifyInterface"));
++          MyAlert(getBundleString("errorJsNotifyInterface"));
+           throw Components.results.NS_ERROR_NO_INTERFACE;
+       }
+       return this;
+@@ -885,7 +887,7 @@ function DoShowAdvancedInfo()
+          textDump += getBundleString("noLogFileOrData");
+     }
+ 
+-    var wnd = window.openDialog("chrome://esc/content/advancedinfo.xul","Info","chrome,centerscreen,width=600,height=500,modal=yes",textDump);
++    var wnd = window.openDialog("chrome://esc/content/advancedinfo.xul","Info","chrome,centerscreen,modal=yes",textDump);
+ 
+ }
+ 
+@@ -1279,7 +1281,8 @@ function DoShowFullEnrollmentUI()
+    }
+    else
+    {
+-       UpdateEnrollmentArea(keyType,keyID,keyInserted,showFullUI);
++     MyAlert(getBundleString("errorPhoneHomeInfo"));
++     window.close();
+    }
+ }
+ 
+@@ -1424,7 +1427,7 @@ function UpdateEnrollmentArea(keyType,ke
+                  HideItem(yes_key_area);
+                  HideItem(enroll_key_message);
+                  HideItem(enrollBtn);
+-                 UpdateESCSize(ESC_ENROLL_WIDTH,ESC_ENROLL_HEIGHT);
++                 UpdateESCSize();
+              }
+          }
+          else
+@@ -1453,7 +1456,7 @@ function UpdateEnrollmentArea(keyType,ke
+ 
+     if(!alreadyEnrolled  && inserted && showExternalUI)
+      {
+-         UpdateESCSize(ESC_ENROLL_WIDTH,ESC_ENROLL_HEIGHT);
++         UpdateESCSize();
+          return;
+      }
+ 
+@@ -1792,9 +1795,73 @@ function InitializeEnrollment()
+   UpdateCoolKeyAvailabilityForEnrollment();
+ }
+ 
++function AdminKeyPressHandler(evt)
++{
++  var newitem = null;
++  var olditem = null;
++  var offset  = 0;
++  var selectedIndex = 0;
++
++  var list = document.getElementById("AdminBindingList");
++  if(!list)
++    return;
++
++  var numRows = list.getRowCount();
++  if(numRows == 0)
++  {
++      return;
++  }
++  list.selectItem(gCurrentSelectedRow);
++  selectedIndex = list.selectedIndex;
++
++  if(selectedIndex == -1)
++  {
++    olditem = list.getItemAtIndex(0);
++    if(olditem) {
++      list.selectItem(olditem);
++      olditem.click();
++    }
++  }
++  selectedIndex = list.selectedIndex;
++  olditem = list.getItemAtIndex(selectedIndex);
++
++  if(evt.keyCode == KeyEvent.DOM_VK_UP) {
++   offset = -1;
++  }
++  if(evt.keyCode == KeyEvent.DOM_VK_DOWN) {
++    offset = 1;
++  }
++
++  if(offset == 0)
++    return;
++
++  if(olditem)  {
++      list.moveByOffset( offset , 1, 0);
++      newitem = list.getItemAtIndex(list.selectedIndex);
++      olditem.blur();
++      if(newitem)
++        newitem.click();
++  }
++
++  var item = null;
++  for( i = 0; i < list.getRowCount(); i ++) {
++      item = list.getItemAtIndex(i);
++
++      if(item && item != gCurrentSelectedRow) {
++          item.setAttribute("class","UnSelectedRow");
++      }
++  }
++}
++
+ function InitializeAdminBindingList()
+ {
+ 
++ var list = document.getElementById("AdminBindingList");
++
++ if(list) {
++   list.addEventListener("keypress", AdminKeyPressHandler, false);
++ }
++
+  gAdminPage = 1;
+ 
+  UpdateAdminBindingListAvailability();
+@@ -1802,8 +1869,7 @@ function InitializeAdminBindingList()
+  DoSetEnrolledBrowserLaunchState(); 
+  DoHandleEnrolledBrowserLaunch();
+ 
+- window.setTimeout('ShowWindow()',250);
+-
++ list.focus();
+ }
+ 
+ //Window related functions
+@@ -1974,12 +2040,18 @@ function SelectESCPage(keyType,keyID,pho
+    var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW);
+    var adminWnd  = IsPageWindowPresent(ADMIN_WINDOW);
+ 
+-   if(keyUninitialized == UNINITIALIZED && !phoneHomeFailed )  //formatted uninitialized card
++   var arr = GetAvailableCoolKeys();
++   var no_launch_external_ui = 0;
++
++    if (arr && arr.length > 1)
++        no_launch_external_ui = 1;
++
++
++   if(keyUninitialized == UNINITIALIZED && !phoneHomeFailed && !no_launch_external_ui )  //formatted uninitialized card
+    {
+        if(enrollWnd)   //Enrollment window is  already up
+        {
+           enrollWnd.focus();
+-          enrollWnd.ShowWindow();
+        }
+        else
+        {
+@@ -2332,12 +2404,14 @@ function UpdateAdminKeyDetailsArea(keyTy
+        }
+        else
+        {
++           DisableItem(enrollbtn);
+            DisableItem(resetpinbtn);
+            DisableItem(formatbtn);
+            if(adminkeymenu)
+            {
+                DisableItem(menu_format);
+                DisableItem(menu_resetpassword);
++               DisableItem(menu_enroll);
+            }
+        }
+ 
+@@ -2762,6 +2836,7 @@ function DoEnrollCoolKey()
+   var tokencode = null;
+   
+   var failed = 0;
++  gErrorAlready = 0;
+ 
+   if (type == "userKey")
+   {
+@@ -2792,12 +2867,13 @@ function DoEnrollCoolKey()
+   {
+      UpdateAdminListRow(keyType,keyID);
+      UpdateAdminKeyDetailsArea(keyType,keyID);
+-     if(!failed)
++     if(!failed && !gErrorAlready)
+      {
+           AdminToggleStatusProgress(1,keyType,keyID);
+           UpdateAdminKeyAreaDetailsLabel(getBundleString("enrollingToken"));
+      }
+   }
++  gErrorAlready = 0;
+ }
+ 
+ function DoCollectPassword(operation)
+@@ -2822,6 +2898,7 @@ function DoResetSelectedCoolKeyPIN()
+   var screennamepwd = null;
+ 
+   var failed = 0;
++  gErrorAlready = 0;
+ 
+   if (GetCoolKeyIsEnrolled(keyType, keyID))
+   {
+@@ -2843,12 +2920,13 @@ function DoResetSelectedCoolKeyPIN()
+      UpdateAdminListRow(keyType,keyID);
+      UpdateAdminKeyDetailsArea(keyType,keyID);
+ 
+-      if(!failed)
++      if(!failed && !gErrorAlready)
+       {
+           AdminToggleStatusProgress(1,keyType,keyID);
+           UpdateAdminKeyAreaDetailsLabel(getBundleString("resettingTokenPIN"));
+       }
+   }
++  gErrorAlready = 0;
+ }
+ 
+ function DoFormatCoolKey(type)
+@@ -2865,6 +2943,7 @@ function DoFormatCoolKey(type)
+   var failed = 0;
+   var globalType = GetCachedTokenType(keyID);
+ 
++  gErrorAlready = 0;
+   if(!type)
+       lType = gKeyEnrollmentType;
+   else
+@@ -2890,12 +2969,13 @@ function DoFormatCoolKey(type)
+   {
+       UpdateAdminListRow(keyType,keyID);
+       UpdateAdminKeyDetailsArea(keyType,keyID);
+-      if(!failed)
++      if(!failed && !gErrorAlready)
+       {
+           AdminToggleStatusProgress(1,keyType,keyID);
+           UpdateAdminKeyAreaDetailsLabel(getBundleString("formatingToken"));
+       }
+   }
++  gErrorAlready = 0;
+ }
+ function DoCancelOperation()
+ {
+@@ -3156,6 +3236,7 @@ function OnCoolKeyStateError(keyType, ke
+      AdminToggleStatusProgress(0,keyType,keyID);
+    }
+ 
++  gErrorAlready = 1;
+   if(!CheckForSecurityMode())
+       MyAlert(typeStr);
+   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
+@@ -3261,9 +3342,73 @@ function refresh()
+   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;
+@@ -3324,6 +3469,7 @@ function loadExternalESCUI()
+         if(ui_id)
+         {
+             ui_id.setAttribute("src",esc_enroll_uri);
++            ///ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
+             UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI)
+         }
+ 
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/esc.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/esc.xul
+--- ./esc/src/app/xul/esc/chrome/content/esc/esc.xul.fix15	2012-11-21 11:14:42.545118881 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/esc.xul	2012-11-21 11:16:21.542042804 -0800
+@@ -147,7 +147,8 @@
+       </hbox>
+   </vbox>
+ 
+-  <iframe id="esc-ui"  flex="1" class="BorderedIFrame" hidden="true"/>
++  <browser id="esc-ui" class="BorderedBrowser" height="725" flex="1" hidden="true" src="" />
++
+   </groupbox>
+   <hbox id = "enrollment_button_box">
+         <spacer flex = "4"/>
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/password.js.fix15 ./esc/src/app/xul/esc/chrome/content/esc/password.js
+--- ./esc/src/app/xul/esc/chrome/content/esc/password.js.fix15	2012-11-21 11:16:28.740186184 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/password.js	2012-11-21 11:18:32.722686536 -0800
+@@ -42,6 +42,21 @@ function doOperation()
+    window.close(); 
+ }
+ 
++//
++// unregister out notify event
++//
++function cleanup()
++{
++    TrayRemoveWindow(null);
++    try {
++      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
++      netkey.rhCoolKeyUnSetNotifyCallback(gNotify);
++    } catch(e) {
++     MyAlert(getBundleString("errorUniversalXPConnect")  + e);
++    }
++
++}
++
+ 
+ function GetLocalPINValue()
+ {
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/password.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/password.xul
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/security.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/security.xul
+--- ./esc/src/app/xul/esc/chrome/content/esc/security.xul.fix15	2012-11-21 14:52:14.192045524 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/security.xul	2012-11-21 14:52:57.839863826 -0800
+@@ -26,6 +26,7 @@
+     onload="InitializeSecurityEnrollment()"
+     width ="600"
+     height= "575"
++    persist="width height"
+     onunload="cleanup();OnSecurityPageHidden();"
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ 
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix15 ./esc/src/app/xul/esc/chrome/content/esc/settings.xul
+--- ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix15	2012-11-21 14:53:16.829219643 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/settings.xul	2012-11-21 14:53:42.456699662 -0800
+@@ -28,6 +28,7 @@
+     width ="720"
+     height= "415"
+     name="admin"
++    persist="width height"
+     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ 
+      <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix15 ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js
+--- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix15	2012-11-21 14:54:00.574038897 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js	2012-11-21 14:58:29.722107000 -0800
+@@ -47,9 +47,10 @@ jsWindNotify.prototype = {
+   {
+      //alert("iid: " + iid);
+      if(!iid.equals(Components.interfaces.rhITrayWindNotify) &&
+-         !iid.equals(Components.interfaces.nsISupports))
++         !iid.equals(Components.interfaces.nsISupports) &&
++         !iid.equals(Components.interfaces.nsIClassInfo)
+       {
+-          //MyAlert(getBundleString("errorJsNotifyInterface"));
++          MyAlert(getBundleString("errorJsNotifyInterface"));
+           throw Components.results.NS_ERROR_NO_INTERFACE;
+       }
+       return this;
+@@ -423,6 +424,13 @@ alert("exception " + e);
+    }
+ }
+ 
++//Cleanup this window if ESC.js doesn't do it
++function traycleanup()
++{
++    TrayRemoveWindow(null);
++}
++
++
+ //String bundling related functions
+ 
+ function loadStringBundle()
+diff -up ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix15 ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties
+--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix15	2012-11-21 11:21:31.426280759 -0800
++++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2012-11-21 11:22:33.427512763 -0800
+@@ -176,6 +176,8 @@ errorSelectKey=Please select a smart car
+ errorEnrolledFirst=Smart card must be enrolled first! Enroll card and try again.
+ enrollmentFor=Enrollment of your 
+ errorNeedKeyForSecMode=Please insert enrolled smart card before attempting secure mode.
++errorEnrollmentUI=Problem loading Enrollment UI, check your network connection, re-insert the card, and try again!
++errorPhoneHomeInfo=Problem loading Phone Home Information, check your network connection, re-insert the card, and try again!
+ wasSuccessful=was successful.
+ pinResetSuccessful=Password Reset was successfull!
+ formatOf=Format of
+diff -up ./esc/src/lib/coolkey/CoolKey.cpp.fix15 ./esc/src/lib/coolkey/CoolKey.cpp
+--- ./esc/src/lib/coolkey/CoolKey.cpp.fix15	2012-11-21 14:58:53.164558727 -0800
++++ ./esc/src/lib/coolkey/CoolKey.cpp	2012-11-21 15:02:47.425039628 -0800
+@@ -1412,7 +1412,7 @@ char *GetTStamp(char *aTime,int aSize)
+     if(aSize < maxSize)
+         return NULL;
+ 
+-    char *tFormat = "[%c]";
++    char *tFormat = (char *) "[%c]";
+     time_t tm = time(NULL);
+     struct tm *ptr = localtime(&tm);
+     strftime(aTime ,maxSize ,tFormat,ptr);
+diff -up ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix15 ./esc/src/lib/coolkey/CoolKeyHandler.cpp
+--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix15	2012-11-21 15:03:00.069280046 -0800
++++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2012-11-21 15:04:00.118420187 -0800
+@@ -1096,7 +1096,7 @@ HRESULT CoolKeyHandler::HttpBeginOpReque
+ 
+     char ascii_port[50];
+     char host_port[200];
+-    char *method = "POST";
++    char *method = (char *) "POST";
+ 
+     if(mCharScreenName && mCharScreenNamePwd)
+     {
+@@ -1131,7 +1131,7 @@ HRESULT CoolKeyHandler::HttpBeginOpReque
+ 
+     string ext_buffer = "";
+ 
+-    char *clientVer = "ESC 1.0.1";
++    char *clientVer = (char *) "ESC 1.0.1";
+     sprintf(buffer,"clientVersion=%s",clientVer);
+ 
+     ext_buffer = buffer;
+diff -up ./esc/src/lib/coolkey/CoolKey_Message.cpp.fix15 ./esc/src/lib/coolkey/CoolKey_Message.cpp
+--- ./esc/src/lib/coolkey/CoolKey_Message.cpp.fix15	2012-11-21 11:25:37.996165274 -0800
++++ ./esc/src/lib/coolkey/CoolKey_Message.cpp	2012-11-21 11:27:42.797605767 -0800
+@@ -560,7 +560,12 @@ void eCKMessage_LOGIN_RESPONSE::encode(s
+ 
+     string lPassword = getStringValue(pKey);
+ 
+-    aOutputVal += sKey + delim1 + lScreenName + delim + pKey + delim1 + lPassword;
++    string ScreenName_encoded, Password_encoded;
++
++    URLEncode_str(lScreenName, ScreenName_encoded);
++    URLEncode_str(lPassword, Password_encoded);
++
++    aOutputVal += sKey + delim1 + ScreenName_encoded + delim + pKey + delim1 + Password_encoded;
+ 
+     eCKMessage::encode(aOutputVal);
+ }
+diff -up ./esc/src/lib/coolkey/NSSManager.cpp.fix15 ./esc/src/lib/coolkey/NSSManager.cpp
+--- ./esc/src/lib/coolkey/NSSManager.cpp.fix15	2012-11-21 15:04:06.329537968 -0800
++++ ./esc/src/lib/coolkey/NSSManager.cpp	2012-11-21 15:04:53.612433763 -0800
+@@ -96,7 +96,7 @@ HRESULT NSSManager::InitNSS(const char *
+         }
+     }
+ 
+-    char *libName = COOLKEY_PKCS11_LIBRARY ;
++    char *libName = (char *) COOLKEY_PKCS11_LIBRARY ;
+ 
+     PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: About to try SECMOD_AddNewModule :%s \n",GetTStamp(tBuff,56),libName));
+ 
+@@ -330,8 +330,8 @@ NSSManager::GetKeyCertNicknames( const C
+ 
+     CERTCertNicknames *nicknames =
+     CERT_NicknameStringsFromCertList(certs,
+-                                     NICKNAME_EXPIRED_STRING,
+-                                     NICKNAME_NOT_YET_VALID_STRING);
++                                    (char *) NICKNAME_EXPIRED_STRING,
++                                    (char *) NICKNAME_NOT_YET_VALID_STRING);
+ 
+     char *curName = NULL;
+ 
+diff -up ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix15 ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp
+--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp.fix15	2012-11-21 15:05:09.934742670 -0800
++++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.cpp	2012-11-21 15:40:49.570037221 -0800
+@@ -35,8 +35,10 @@
+ 
+ static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKeySmart");
+ 
++static const PRUint32 COOLKEY_SHUTDOWN_WAIT_INTERVAL = 3;
++
+ SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule *aModule)
+-  : mModule(aModule), mThread(NULL)
++  : mModule(aModule), mThread(NULL), mExitThread(NULL)
+ {
+     char tBuff[56];
+     PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+@@ -184,6 +186,9 @@ void SmartCardMonitoringThread::Execute(
+ 
+     } while (1);
+ 
++   PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
++             ("%s SmartCardMonitoringThread::Execute Leaving thread : \n",GetTStamp(tBuff,56)));
++
+ }
+ 
+ void SmartCardMonitoringThread::Interrupt()
+@@ -195,6 +200,14 @@ void SmartCardMonitoringThread::Interrup
+     if(mThread)
+     {
+         SECStatus rv;
++
++        if (!mExitThread) {
++            mExitThread = PR_CreateThread(PR_SYSTEM_THREAD, ExitTimeout, this,
++                              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
++                              PR_JOINABLE_THREAD, 0);
++        }
++
++
+         rv = SECMOD_CancelWait(mModule);
+         if (rv !=SECSuccess) {
+             PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+@@ -255,3 +268,28 @@ void SmartCardMonitoringThread::LaunchEx
+ {
+     ((SmartCardMonitoringThread*)arg)->Execute();
+ }
++
++void SmartCardMonitoringThread::ExitTimeout(void *arg)
++{
++  char tBuff[56];
++  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
++            ("%s SmartCardMonitoringThread::ExitTimeout : \n",GetTStamp(tBuff,56)));
++
++
++  if (arg == NULL) {
++     return;
++  }
++
++  PR_Sleep(PR_SecondsToInterval(COOLKEY_SHUTDOWN_WAIT_INTERVAL));
++
++  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
++            ("%s SmartCardMonitoringThread::ExitTimeout : wait is done. \n",GetTStamp(tBuff,56)));
++
++  if(((SmartCardMonitoringThread*)arg)->mThread != NULL)  {
++
++     PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
++            ("%s SmartCardMonitoringThread::ExitTimeout : Timeout expired while SECMOD_Cancel is hanging, good-bye..! \n",GetTStamp(tBuff,56)));
++
++    _exit(0);
++  }
++}
+diff -up ./esc/src/lib/coolkey/SmartCardMonitoringThread.h.fix15 ./esc/src/lib/coolkey/SmartCardMonitoringThread.h
+--- ./esc/src/lib/coolkey/SmartCardMonitoringThread.h.fix15	2012-11-21 15:14:55.270744772 -0800
++++ ./esc/src/lib/coolkey/SmartCardMonitoringThread.h	2012-11-21 15:16:42.068742060 -0800
+@@ -45,9 +45,11 @@ class SmartCardMonitoringThread
+   void Remove(CoolKeyInfo *info);
+ 
+   static void LaunchExecute(void *arg);
++  static void ExitTimeout(void *arg);
+   
+   SECMODModule *mModule;
+   PRThread* mThread;
++  PRThread* mExitThread;
+   char* mCurrentActivation;
+ };
+ 
+diff -up ./esc/src/lib/notifytray/notifytray.c.fix15 ./esc/src/lib/notifytray/notifytray.c
+--- ./esc/src/lib/notifytray/notifytray.c.fix15	2012-11-21 15:35:54.119380073 -0800
++++ ./esc/src/lib/notifytray/notifytray.c	2012-11-21 15:36:57.948605760 -0800
+@@ -218,7 +218,7 @@ void notify_icon_send_tooltip_msg(const
+     if(!message || !notify)
+         return;
+ 
+-    gchar *msg_title = NULL;
++    const gchar *msg_title = NULL;
+ 
+ 
+     if(!title)
diff --git a/esc-1.1.0-fix16.patch b/esc-1.1.0-fix16.patch
new file mode 100644
index 0000000..b1169bd
--- /dev/null
+++ b/esc-1.1.0-fix16.patch
@@ -0,0 +1,423 @@
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix16 ./esc/src/app/xul/esc/chrome/content/esc/ESC.js
+--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix16	2012-11-28 14:47:47.510976503 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2012-11-28 14:49:58.889984069 -0800
+@@ -133,7 +133,6 @@ jsNotify.prototype = {
+   var gNotify=null;
+ 
+   try {
+-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     netkey = Components.classes["@redhat.com/rhCoolKey;1"].getService();
+     netkey = netkey.QueryInterface(Components.interfaces.rhICoolKey);
+     gNotify = new jsNotify;
+@@ -152,7 +151,6 @@ function cleanup()
+ {
+     TrayRemoveWindow(null);
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       netkey.rhCoolKeyUnSetNotifyCallback(gNotify);
+     } catch(e) {
+      MyAlert(getBundleString("errorUniversalXPConnect")  + e);
+@@ -425,7 +423,6 @@ function commitConfigValues()
+              var res = 0;
+ 
+              try {
+-                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                 res = netkey.SetCoolKeyConfigValue("esc.tps.url",tps_uri_value);
+ 
+             } catch(e) {
+@@ -434,7 +431,6 @@ function commitConfigValues()
+             }
+ 
+             try {
+-                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+                 res = netkey.SetCoolKeyConfigValue("esc.enroll.ui.url",esc_enroll_value);
+                 grantPrivilegesURL(esc_enroll_value);
+@@ -466,7 +462,6 @@ function InitializeConfigUI()
+    if(netkey)
+    {
+              try {
+-                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+                 tps_uri = netkey.GetCoolKeyConfigValue("esc.tps.url");
+ 
+@@ -487,7 +482,6 @@ function InitializeConfigUI()
+         var esc_enroll_uri = null;
+ 
+         try {
+-                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     
+                 esc_enroll_uri = netkey.GetCoolKeyConfigValue("esc.enroll.ui.url");
+     
+@@ -550,7 +544,6 @@ function CoolKeySetDataValue(aKeyType,aK
+         if(netkey)
+         {
+              try {
+-                    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+                 netkey.SetCoolKeyDataValue(aKeyType,aKeyID,name,value);
+ 
+@@ -567,7 +560,6 @@ function CoolKeySetTokenPin(pin)
+         if(netkey)
+         {
+              try { 
+-                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                 netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"TokenPin",pin);
+ 
+             } catch(e) {
+@@ -581,7 +573,6 @@ function CoolKeySetUidPassword(uid,pwd)
+       if(netkey)
+       {
+           try {
+-              netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+               netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"UserId",uid);
+               netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"Password",pwd);
+ 
+@@ -646,7 +637,6 @@ function ReportException(msg, e)
+ function GetCoolKeyStatus(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.GetCoolKeyStatus(keyType, keyID);
+   } catch (e) {
+     ReportException(getBundleString("errorCoolKeyGetStatus"), e);
+@@ -665,7 +655,6 @@ function ConfigValueWithKeyID(keyID,conf
+ function GetCoolKeyPolicy(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.GetCoolKeyPolicy(keyType, keyID);
+   } catch (e) {
+     //ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
+@@ -676,7 +665,6 @@ function GetCoolKeyPolicy(keyType, keyID
+ function GetCoolKeyRequiresAuth(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.GetCoolKeyRequiresAuthentication(keyType, keyID);
+   } catch(e) {
+     ReportException(getBundleString("errorCoolKeyRequiresAuth"), e);
+@@ -687,7 +675,6 @@ function GetCoolKeyRequiresAuth(keyType,
+ function AuthenticateCoolKey(keyType, keyID,aPIN)
+ {   
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.AuthenticateCoolKey(keyType, keyID,"netscape");
+   } catch(e) {
+     ReportException(getBundleString("errorAuthCoolKey"), e);
+@@ -698,7 +685,6 @@ function AuthenticateCoolKey(keyType, ke
+ function GetCoolKeyIsAuthed(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.GetCoolKeyIsAuthenticated(keyType, keyID);
+   } catch(e) {
+     ReportException(getBundleString("errorCoolKeyIsAuth"), e);
+@@ -717,7 +703,6 @@ function GetCoolKeyIssuer(keyType,keyID)
+     if(!issuer && (GetStatusForKeyID(keyType, keyID) == getBundleString("statusEnrolled")))
+     {
+         try {
+-            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+             issuer = netkey.GetCoolKeyIssuer(keyType,keyID);
+ 
+             var issuer_url = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL);
+@@ -757,7 +742,6 @@ function GetCoolKeyIssuedTo(keyType,keyI
+     var issuedTo = null;
+ 
+     try {
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         issuedTo = netkey.GetCoolKeyIssuedTo(keyType,keyID);
+ 
+     } catch (e)
+@@ -895,7 +879,6 @@ function GetCoolKeyCertNicknames(aKeyTyp
+ {
+   try {
+     var nameArr;
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       var inArray = netkey.GetCoolKeyCertNicknames(aKeyType,aKeyId, {} );
+       nameArr = new Array(inArray.length);
+       var i;
+@@ -915,7 +898,6 @@ function GetCoolKeyVersion()
+     var result = null;
+ 
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       result = netkey.GetCoolKeyVersion();
+     return result;
+   } catch(e) {
+@@ -928,7 +910,6 @@ function GetCoolKeyCertInfo(aKeyType,aKe
+ {
+   try {
+     var info = null;
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       info = netkey.GetCoolKeyCertInfo(aKeyType,aKeyId, aCertNickname );
+       return info;
+   } catch(e) {
+@@ -942,7 +923,6 @@ function GetAvailableCoolKeys()
+   try {
+     var keyArr;
+ 
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       var inArray = netkey.GetAvailableCoolKeys( {} );
+       keyArr = new Array(inArray.length);
+       var i;
+@@ -963,7 +943,6 @@ function CoolKeyLogMsg(aLogLevel,aMessag
+         return;
+ 
+     try { 
+-         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          netkey.CoolKeyLogMsg(aLogLevel,aMessage);
+          } catch(e) {
+          }
+@@ -972,7 +951,6 @@ function CoolKeyLogMsg(aLogLevel,aMessag
+ function ChallengeCoolKey(keyType, keyID, data)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.ChallengeCoolKey(keyType, keyID, data);
+   } catch(e) {
+     return [];
+@@ -982,7 +960,6 @@ function ChallengeCoolKey(keyType, keyID
+ function EnrollCoolKey(keyType, keyID, enrollmentType, screenname, pin,screennamepwd,tokencode)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     netkey.EnrollCoolKey(keyType, keyID, enrollmentType, screenname, pin,screennamepwd,tokencode);
+   } catch(e) {
+     ReportException(getBundleString("errorEnollCoolKey"), e);
+@@ -995,7 +972,6 @@ function EnrollCoolKey(keyType, keyID, e
+ function GetCoolKeyIsEnrolled(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     return netkey.GetCoolKeyIsEnrolled(keyType, keyID);
+   } catch(e) {
+     ReportException(getBundleString("errorCoolKeyIsEnrolled"), e);
+@@ -1006,7 +982,6 @@ function GetCoolKeyIsEnrolled(keyType, k
+ function ResetCoolKeyPIN(keyType, keyID, screenname, pin,screennamepwd)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     netkey.ResetCoolKeyPIN(keyType, keyID, screenname, pin,screennamepwd);
+   } catch(e) {
+     ReportException(getBundleString("errorResetCoolKeyPIN"), e);
+@@ -1017,7 +992,6 @@ function ResetCoolKeyPIN(keyType, keyID,
+ function FormatCoolKey(keyType, keyID, type, screenname, pin,screennamepwd,tokencode)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     netkey.FormatCoolKey(keyType, keyID, type, screenname, pin,screennamepwd,tokencode);
+   } catch(e) {
+     ReportException(getBundleString("errorFormatCoolKey"), e);
+@@ -1029,7 +1003,6 @@ function FormatCoolKey(keyType, keyID, t
+ function CancelCoolKeyOperation(keyType, keyID)
+ {
+   try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     netkey.CancelCoolKeyOperation(keyType, keyID);
+   } catch(e) {
+     ReportException(getBundleString("errorCancelCoolKey"), e);
+@@ -3653,7 +3626,6 @@ function getESCEnrollmentUI()
+    if(netkey)
+    {
+         try {
+-                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+             esc_enroll_uri = netkey.GetCoolKeyConfigValue("esc.enroll.ui.url");
+ 
+             } catch(e) {
+@@ -3692,7 +3664,6 @@ function grantPrivilegesURL(aURL)
+     if(prePath)
+     {
+         try {
+-                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             res = netkey.SetCoolKeyConfigValue("capability.principal.codebase.p0.id",prePath);
+ 
+@@ -3716,7 +3687,6 @@ function DoCoolKeySetConfigValue(configV
+    if(netkey)
+    {
+       try {
+-            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             result = netkey.SetCoolKeyConfigValue(configValue,newValue);
+ 
+@@ -3739,7 +3709,6 @@ function DoCoolKeyGetConfigValue(configV
+    if(netkey)
+    {
+       try {
+-            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             result = netkey.GetCoolKeyConfigValue(configValue);
+ 
+@@ -3791,7 +3760,6 @@ function DoGetCoolKeyIsReallyCoolKey(key
+         return 0;
+ 
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       var isCool =  netkey.GetCoolKeyIsReallyCoolKey(keyType, keyID);
+ 
+       return isCool;
+@@ -3824,7 +3792,6 @@ function DoCoolKeyGetIssuerUrl(keyType,k
+     }
+ 
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+       var tries = 0;
+       while(tries < 3 )  
+@@ -3908,7 +3875,6 @@ function DoCoolKeyGetATR(keyType,keyID)
+ {
+     var atr = null;
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       atr =  netkey.GetCoolKeyATR(keyType, keyID);
+     } catch (e) {
+       return atr;
+@@ -3925,7 +3891,6 @@ function DoCoolKeyGetTokenName(keyType,k
+ 
+     var name = null;
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       name =  netkey.GetCoolKeyTokenName(keyType, keyID);
+     } catch (e) {
+       return name;
+@@ -3940,7 +3905,6 @@ function DoGetCoolKeyGetAppletVer(keyTyp
+     var ver = -1;
+ 
+     try {
+-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       var ver  =  netkey.GetCoolKeyGetAppletVer(keyType, keyID,isMajor);
+     } catch (e) {
+       ver = -1;
+@@ -4633,7 +4597,6 @@ function DoMyAlert(message,title)
+ {
+    if(!message || !title)
+        return;     try {
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService); 
+ 
+        prompts.alert(window,title,message);
+diff -up ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix16 ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js
+--- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix16	2012-11-28 14:47:52.965976817 -0800
++++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js	2012-11-28 14:48:43.665979745 -0800
+@@ -48,7 +48,7 @@ jsWindNotify.prototype = {
+      //alert("iid: " + iid);
+      if(!iid.equals(Components.interfaces.rhITrayWindNotify) &&
+          !iid.equals(Components.interfaces.nsISupports) &&
+-         !iid.equals(Components.interfaces.nsIClassInfo)
++         !iid.equals(Components.interfaces.nsIClassInfo))
+       {
+           MyAlert(getBundleString("errorJsNotifyInterface"));
+           throw Components.results.NS_ERROR_NO_INTERFACE;
+@@ -63,7 +63,6 @@ jsWindNotify.prototype = {
+ 
+  // GECKO ONLY initialization
+ try {
+-   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    gTray =  Components.classes["@redhat.com/rhTray;1"].getService();
+ 
+ 
+@@ -129,7 +128,6 @@ function GetTrayIsInitialized()
+ 
+    try
+    {
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+         rv = gTray.isInitializedAlready();
+ 
+@@ -155,7 +153,6 @@ function ShowAllWindows()
+ 
+     try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+         gTray.showall();
+ 
+@@ -175,7 +172,6 @@ function HideAllWindows()
+ 
+     try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+         gTray.hideall();
+ 
+@@ -196,7 +192,6 @@ function ShowWindow()
+ 
+     try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+         gTray.show(gBaseWindow);
+ 
+@@ -216,7 +211,6 @@ function HideWindow()
+         
+     try {
+          
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         
+         gTray.hide(gBaseWindow);
+         
+@@ -235,7 +229,6 @@ function TrayRemoveWindowNotify()
+     {
+          try {
+ 
+-            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             gTray.unsetwindnotifycallback(gWindNotify);
+             
+@@ -254,7 +247,6 @@ function TrayRemoveWindow(doPreserveNoti
+     {
+         try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             gTray.remove(gBaseWindow);
+ 
+@@ -277,7 +269,6 @@ function TrayAddWindow()
+ 
+          try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ 
+             gTray.add(gBaseWindow);
+ 
+@@ -304,7 +295,6 @@ function TraySendNotificationMessage(aTi
+ 
+         try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ 
+ 
+         gTray.sendnotification(aTitle,aMessage,aSeverity,aTimeout,aIcon);
+@@ -329,7 +319,6 @@ function TrayHideNotificationIcon()
+ 
+         try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ 
+         gTray.hideicon();
+ 
+@@ -361,7 +350,6 @@ function TrayShowNotificationIcon()
+ 
+         try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         gTray.settooltipmsg(getBundleString("escTitle"));
+         gTray.showicon();
+ 
+@@ -383,7 +371,6 @@ function TrayShowTooltip(aMessage)
+ 
+         try {
+ 
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ ;
+         gTray.settooltipmsg(aMessage);
+ 
+@@ -413,7 +400,6 @@ function TrayChangeMenuItemText(aIndex,
+     if(gTray && gBaseWindow)
+     {
+         try {
+-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+         gTray.setmenuitemtext(aIndex,aText);
+         gTray.showicon();
+         } catch(e) {
diff --git a/esc-1.1.0-fix17.patch b/esc-1.1.0-fix17.patch
new file mode 100644
index 0000000..d2501f0
--- /dev/null
+++ b/esc-1.1.0-fix17.patch
@@ -0,0 +1,126 @@
+diff -up ./esc/coreconf/Linux3.9.mk.fix17 ./esc/coreconf/Linux3.9.mk
+--- ./esc/coreconf/Linux3.9.mk.fix17	2013-06-17 18:52:29.341000000 -0400
++++ ./esc/coreconf/Linux3.9.mk	2013-06-17 18:52:48.988000000 -0400
+@@ -0,0 +1,35 @@
++# BEGIN COPYRIGHT BLOCK
++# This Program is free software; you can redistribute it and/or modify it under
++# the terms of the GNU General Public License as published by the Free Software
++# Foundation; version 2 of the License.
++#
++# This Program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
++# Place, Suite 330, Boston, MA 02111-1307 USA.
++#
++# Copyright (C) 2005 Red Hat, Inc.
++# All rights reserved.
++# END COPYRIGHT BLOCK
++
++#
++# Config stuff for Linux 3.9 (ELF)
++#
++
++include $(CORE_DEPTH)/coreconf/Linux.mk
++
++OS_REL_CFLAGS   += -DLINUX2_1
++MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
++ifdef BUILD_OPT
++            OPTIMIZER       = -O2
++endif
++
++ifdef MAPFILE
++	MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
++        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
+diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix17 ./esc/src/app/xpcom/rhCoolKey.cpp
+--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix17	2013-06-17 18:48:27.263000000 -0400
++++ ./esc/src/app/xpcom/rhCoolKey.cpp	2013-06-17 18:48:27.328000000 -0400
+@@ -1383,7 +1383,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAp
+ 
+     *_retval = ver;
+ 
+-    return S_OK;
++    return NS_OK;
+ }
+ 
+ /* boolean rhCoolKeyIsEnrolled (in unsigned long aKeyType, in string aKeyID); */
+diff -up ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix17 ./esc/src/app/xpcom/tray/rhLinuxTray.cpp
+--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix17	2013-06-17 18:48:27.267000000 -0400
++++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp	2013-06-17 18:48:27.329000000 -0400
+@@ -152,7 +152,10 @@ NS_IMETHODIMP rhTray::Unsetwindnotifycal
+ NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
+ {
+     char tBuff[56];
+-    NS_ENSURE_ARG(aWindow);
++   
++    if ( aWindow == NULL) {
++       return NS_ERROR_FAILURE;
++    }
+ 
+     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p \n",GetTStamp(tBuff,56),aWindow));
+     HRESULT res = Initialize();
+@@ -509,7 +512,7 @@ HRESULT rhTray::AddListener(nsIBaseWindo
+     nsresult rv;
+ 
+     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p \n",GetTStamp(tBuff,56),aWindow));
+-    NS_ENSURE_ARG(aWindow);
++    //NS_ENSURE_ARG(aWindow);
+ 
+     nativeWindow aNativeWindow;
+     rv = aWindow->GetParentNativeWindow( &aNativeWindow );
+@@ -635,13 +638,13 @@ NS_IMETHODIMP rhTray::Setmenuitemtext(PR
+     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext:  index: %d text %s. \n",GetTStamp(tBuff,56),aIndex,aText));
+ 
+     if(!aText)
+-        return S_OK;
++        return NS_OK;
+ 
+     if(!mIconMenu)
+-        return S_OK;
++        return NS_OK;
+ 
+     if(aIndex < 0 || aIndex > 10)
+-        return S_OK; 
++        return NS_OK; 
+ 
+     GList *iterate = NULL;
+ 
+@@ -670,7 +673,7 @@ NS_IMETHODIMP rhTray::Setmenuitemtext(PR
+         i++;
+     }
+ 
+-    return S_OK;
++    return NS_OK;
+ }
+ 
+ //rhTrayWindNotify methods
+diff -up ./esc/src/app/xul/esc/application.ini.fix17 ./esc/src/app/xul/esc/application.ini
+--- ./esc/src/app/xul/esc/application.ini.fix17	2013-06-17 18:48:27.243000000 -0400
++++ ./esc/src/app/xul/esc/application.ini	2013-06-17 18:48:27.330000000 -0400
+@@ -25,11 +25,11 @@ Vendor=RedHat
+ Name=ESC
+ ;
+ ; This field specifies your application's version.  This field is optional.
+-Version=1.1.0-16
++Version=1.1.0-19
+ ;
+ ; This field specifies your application's build ID (timestamp).  This field is
+ ; required.
+-BuildID=0000001017
++BuildID=0000001019
+ ;
+ ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
+ ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
+@@ -47,6 +47,6 @@ MinVersion=6.0.0
+ ; application requires.  It should be specified if your application uses
+ ; unfrozen interfaces.  Specifying 1.8 matches all releases with a version
+ ; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
+-MaxVersion=20.0.0
++MaxVersion=22.0.0
+ 
+ [Shell]
diff --git a/esc.spec b/esc.spec
index e330195..d551891 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,20 +1,28 @@
 Name: esc 
 Version: 1.1.0
-Release: 19%{?dist} 
+Release: 20%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
-License: GPL
+License: GPL+
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
 Group: Applications/Internet
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#Fix to build against XUlrunner SDK.
 Patch1: esc-1.1.0-fix1.patch
+#Fix to the smart card handling thread
 Patch2: esc-1.1.0-fix2.patch
+#Simple fix to some smart card error messages.
 Patch3: esc-1.1.0-fix3.patch
+#Add -fno-strict-aliasing compile flag.
 Patch4: esc-1.1.0-fix4.patch
+#Fix error with reporting a certain smart card error message.
 Patch5: esc-1.1.0-fix5.patch
+#Allow the http library the ability to observe security exceptions for incoming server certs.
 Patch6: esc-1.1.0-fix6.patch
+#Ipv6 support for the http library.
 Patch7: esc-1.1.0-fix7.patch
+
 Patch8: esc-1.1.0-fix8.patch
 Patch9: esc-1.1.0-fix9.patch
 Patch10: esc-1.1.0-fix10.patch
@@ -22,6 +30,9 @@ Patch11: esc-1.1.0-fix11.patch
 Patch12: esc-1.1.0-fix12.patch
 Patch13: esc-1.1.0-fix13.patch
 Patch14: esc-1.1.0-fix14.patch
+Patch15: esc-1.1.0-fix15.patch
+Patch16: esc-1.1.0-fix16.patch
+Patch17: esc-1.1.0-fix17.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -58,12 +69,12 @@ AutoReqProv: 0
 %define escxuldir src/app/xul/esc
 %define escxulchromeicons %{escxuldir}/chrome/icons/default
 %define escdaemon escd
+%define geckoversion 21.0
 
-
-Source0: %{escname}.tar.bz2
-Source1: esc
-Source2: esc.desktop
-Source3: esc.png
+Source0: http://pki.fedoraproject.org/pki/sources/%name/%{escname}.tar.bz2 
+Source1: http://pki.fedoraproject.org/pki/sources/%name/esc
+Source2: http://pki.fedoraproject.org/pki/sources/%name/esc.desktop
+Source3: http://pki.fedoraproject.org/pki/sources/%name/esc.png
 
 
 %description
@@ -90,12 +101,16 @@ cryptographic smartcards.
 %patch12 -p1 -b .fix12
 %patch13 -p1 -b .fix13
 %patch14 -p1 -b .fix14
+%patch15 -p1 -b .fix15
+%patch16 -p1 -b .fix16
+%patch17 -p1 -b .fix17
 
 %build
 
-GECKO_SDK_PATH=%{_libdir}/xulrunner-devel-2/sdk
-GECKO_BIN_PATH=%{_libdir}/xulrunner-2
-GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-2
+GECKO_SDK_PATH=%{_libdir}/xulrunner-devel-%{geckoversion}/sdk
+GECKO_BIN_PATH=%{_libdir}/xulrunner
+GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-%{geckoversion}
+GECKO_IDL_PATH=/usr/share/idl/xulrunner-%{geckoversion}
 
 %ifarch x86_64 ppc64 ia64
 USE_64=1
@@ -105,6 +120,7 @@ export USE_64
 export GECKO_SDK_PATH
 export GECKO_BIN_PATH
 export GECKO_INCLUDE_PATH
+export GECKO_IDL_PATH
 # last setup call moved  the current directory
 
 cd esc 
@@ -213,9 +229,12 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %changelog
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
+* Mon Jun 17 2013 Jack Magne <jmagne@redhat.com>= 1.1.0-21
+- Appease latest compiler errors and build to xulrunner 21.0.
+* Wed Nov 28 2012 Jack Magne <jmagne@redhat.com>= 1.1.0-20
+- Gecko no longer supports UniversalXPConnect, remove it.
+* Wed Nov 21 2012 Jack Magne <jmagne@redhat.com>= 1.1.0-19
+- Pick up latest fixes.
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild