* Look for the openssl program at compile time. If not found, call
openssl through $PATH at runtime.
This commit is contained in:
parent
b4a040e52b
commit
db1973d012
2 changed files with 6 additions and 2 deletions
|
@ -776,7 +776,7 @@ void LocalStore::exportPath(const Path & path, bool sign,
|
|||
args.push_back(secretKey);
|
||||
args.push_back("-in");
|
||||
args.push_back(hashFile);
|
||||
string signature = runProgram("openssl", true, args);
|
||||
string signature = runProgram(OPENSSL_PATH, true, args);
|
||||
|
||||
writeString(signature, hashAndWriteSink);
|
||||
|
||||
|
@ -852,7 +852,7 @@ Path LocalStore::importPath(bool requireSignature, Source & source)
|
|||
args.push_back("-pubin");
|
||||
args.push_back("-in");
|
||||
args.push_back(sigFile);
|
||||
string hash2 = runProgram("openssl", true, args);
|
||||
string hash2 = runProgram(OPENSSL_PATH, true, args);
|
||||
|
||||
/* Note: runProgram() throws an exception if the signature
|
||||
is invalid. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue