From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 15 Sep 2009 23:30:50 +0000 (+0000)
Subject: [WinOF] Reflect WinOF installs into %ProgramFiles%. Use signature from from new OFA... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=27d79aea5e0e1ea77969f9858f199ac50408f3ff;p=~shefty%2Frdma-win.git

[WinOF] Reflect WinOF installs into %ProgramFiles%. Use signature from from new OFA digital-ID certificate.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2435 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/WinOF/WIX/HPC/cert-add.bat b/trunk/WinOF/WIX/HPC/cert-add.bat
index c3374c8d..49e3349e 100644
--- a/trunk/WinOF/WIX/HPC/cert-add.bat
+++ b/trunk/WinOF/WIX/HPC/cert-add.bat
@@ -41,7 +41,7 @@ set CISF=rem-cert-ADD.bat
 if exist "%CISF%"  (
     set CIS="%CD%\%CISF%"
 ) else (
-    set CIS="%ProgramFiles(x86)%\WinOF\%CISF%"
+    set CIS="%ProgramFiles%\WinOF\%CISF%"
 )
 
 if not exist %CIS% (
@@ -51,9 +51,11 @@ if not exist %CIS% (
 
 rem Certificate ID's (Serial Number) for the OFA WinOF driver signing cert
 
-set OfaWinOfCertID=71175fca6b85d5c2e0864df16349ad84
+rem [expired 8/20/09] set OFA_CERT_ID=71175fca6b85d5c2e0864df16349ad84
+rem [expires 8/20/2011]
+set OFA_CERT_ID=765c1a5b6e0fcad96ae0c35cd2f9523e
 
-rem Opoenfabrics Alliance Trusted SW Publisher
+rem Openfabrics Alliance Trusted SW Publisher
 set CERTNAME=OFA_TP.cer
 
 if exist "%CERTNAME%" (
@@ -62,10 +64,9 @@ if exist "%CERTNAME%" (
 )
 
 rem extract OFA cert from local Trusted Publisher Cert Store.
-
 rem test for OFA cert in local TrustedPublisher cert store
 
-certutil -store TRUSTEDPUBLISHER %OfaWinOfCertID%  1> Nul
+certutil -store TRUSTEDPUBLISHER %OFA_CERT_ID%  1> Nul
 IF %ERRORLEVEL% NEQ 0 (
     echo 'OpenFabrics Alliance' Trusted SW Publisher certificate not in local Cert Store.
     echo Install WinOF on head-node or Install OFA Cert from WinOF installer .msi file.
@@ -79,7 +80,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 rem Extract OFA cert to %CERTNAME% file.
 if EXIST "%CERTNAME%"  del /F/Q %CERTNAME%
-certutil -store TRUSTEDPUBLISHER %OfaWinOfCertID% %CERTNAME% 1> Nul
+certutil -store TRUSTEDPUBLISHER %OFA_CERT_ID% %CERTNAME% 1> Nul
 IF %ERRORLEVEL% NEQ 0 (
     echo Unable to extract OFA cert from local Trusted Publisher Store err %ERRORLEVEL%
     exit /B 1
@@ -122,8 +123,8 @@ if "%2" == "" (
 
 :again
 
-rem  echo call clusrun /node:%1 %1\%CISF% %OfaWinOfCertID% %1\%CERTNAME%
-  clusrun /nodes:%2 %1\%CISF% %OfaWinOfCertID% %1\%CERTNAME%
+rem  echo call clusrun /node:%1 %1\%CISF% %OFA_CERT_ID% %1\%CERTNAME%
+  clusrun /nodes:%2 %1\%CISF% %OFA_CERT_ID% %1\%CERTNAME%
   shift /2
   if "%2" == "" goto cpy_cleanup
   timeout /T 5