[cpp-sp COMMIT] /branches/REL_2/configs/keygen.bat-wix

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  7 17:50:08 2012
New Revision: 3647

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3647&view=rev
Log:
KeyGen no longer needs a path - we run it after rthe path has been set

Modified:
    branches/REL_2/configs/keygen.bat-wix

Modified: branches/REL_2/configs/keygen.bat-wix
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/keygen.bat-wix?rev=3647&r1=3646&r2=3647&view=diff
==============================================================================
--- branches/REL_2/configs/keygen.bat-wix (original)
+++ branches/REL_2/configs/keygen.bat-wix Mon May  7 17:50:08 2012
@@ -29,7 +29,6 @@
 if not defined FQDN goto guess_fqdn
 
 :generate
-set PATH=%PREFIX%..\..\lib;%PREFIX%..\..\bin
 set CNF="%PREFIX%sp-cert.cnf"
 echo # OpenSSL configuration file for creating sp-cert.pem    >%CNF%
 echo [req]                                                   >>%CNF%
@@ -46,7 +45,7 @@
 echo [ext]                                                   >>%CNF%
 if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)
 echo subjectKeyIdentifier=hash                               >>%CNF%
-"@-PROGRAMFILES- at 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
+openssl.exe req -config %PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem
 del %CNF%
 exit /b