KeyGen no longer needs a path - we run it after rthe path has been set
authorRod Widdowson <rdw@steadingsoftware.com>
Mon, 7 May 2012 16:50:08 +0000 (16:50 +0000)
committerRod Widdowson <rdw@steadingsoftware.com>
Mon, 7 May 2012 16:50:08 +0000 (16:50 +0000)
configs/keygen.bat-wix

index ca8002c..2a3c3f3 100644 (file)
@@ -29,7 +29,6 @@ set /a DAYS=%YEARS%*365
 if not defined FQDN goto guess_fqdn\r
 \r
 :generate\r
-set PATH=%PREFIX%..\..\lib;%PREFIX%..\..\bin\r
 set CNF="%PREFIX%sp-cert.cnf"\r
 echo # OpenSSL configuration file for creating sp-cert.pem    >%CNF%\r
 echo [req]                                                   >>%CNF%\r
@@ -46,7 +45,7 @@ echo CN=%FQDN%                                               >>%CNF%
 echo [ext]                                                   >>%CNF%\r
 if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)\r
 echo subjectKeyIdentifier=hash                               >>%CNF%\r
-"@-PROGRAMFILES-@Shibboleth\SP\lib\openssl.exe" req -config %PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem\r
+openssl.exe req -config %PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem\r
 del %CNF%\r
 exit /b\r
 \r