[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.13, 1.13.4.1

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15660

Modified Files:
      Tag: RHPKI_7_3_BRANCH
	ESC.js 
Log Message:
Add code to read a global phone home pref under strict circumstances. Bug#352991.



Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- ESC.js	5 Apr 2007 18:39:52 -0000	1.13
+++ ESC.js	19 Nov 2007 19:23:29 -0000	1.13.4.1
@@ -51,6 +51,8 @@
 const  ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
 const  ESC_SECURITY_URL="esc.security.url";
 const  ESC_SECURE_URL="esc.secure.url";
+const  ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
+const  SPECIAL_ATR="3B769400FF6276010000";
 
 const  CLEAN_TOKEN = "cleanToken";
 const  UNINITIALIZED        = 1;
@@ -280,6 +282,11 @@
       return true;
   }
 
+  //Check for special key since we have no phone home info.
+
+  
+  home = GetGlobalPhoneHomeUrl(keyType,keyID);
+  
 
   var homeRes = false;
 
@@ -291,8 +298,9 @@
 
   // Launch the config dialog only if we can't
   // Phone Home and we are not in the special security mode
+  // or if we are not using a special key
 
-  if(!homeRes && !CheckForSecurityMode())
+  if(!homeRes && !CheckForSecurityMode() )
   {
       recordMessage("About to launch CONFIG , non secmode...");
 
@@ -301,6 +309,48 @@
 
   return homeRes;
 }
+
+//Get global phone home url only for a special key
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+   var globalIssuerURL=null;
+   var specialATR=SPECIAL_ATR;
+   var phonHomeURL= DoCoolKeyGetATR(keyType,keyID);
+
+   var specialAppletVerMaj=1;
+   var specialAppletVerMin=1;
+
+
+   var appletVerMaj = DoGetCoolKeyGetAppletVer(keyType, keyID , true);
+   var appletVerMin = DoGetCoolKeyGetAppletVer(keyType, keyID, false);
+  
+   if( (appletVerMaj != specialAppletVerMaj) || 
+        ( appletVerMin != specialAppletVerMin))  {
+
+       return null;
+   } 
+
+   var keyATR =  DoCoolKeyGetATR(keyType,keyID);
+
+   if( keyATR != specialATR)  {
+
+       return null;
+
+   }
+
+   globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+   if(globalIssuerURL==null)  {
+       return null;
+   }
+
+   return globalIssuerURL;
+
+}
+
+ 
 //Test Phone Home url in config UI
 
 function DoPhoneHomeTest()