fix uica PATHs

Author: dderjoel

CryptOpt

@@ -26,6 +26,6 @@ INSTALLDIR="$(dirname "${0}")"
 cd "${INSTALLDIR}"
 
 #run
-PATH="$(realpath ./bins/node/bin):${PATH}" \
+PATH="$(realpath ./bins/uiCA):$(realpath ./bins/node/bin):${PATH}" \
   /usr/bin/env node \
   "./dist/CryptOpt.js" "${@}"

src/optimizer/measure.class.ts

@@ -164,13 +164,14 @@ export default class MeasureUtil {
 
         // call uiCA
         const uiCAArgs = ["-TPonly", "-arch", this.timer, "-raw", join(tmpDir, "binary.bin")];
-        const r = spawnSync("./bins/uiCA/uiCA.py", uiCAArgs);
+        const r = spawnSync("uiCA.py", uiCAArgs);
         if (r.status != 0) {
           throw new Error(
             `uiCA command failed. STDERR:${r.stderr}, STDOUT: ${r.stdout}. May be because ./uiCA is not in the cwd.`,
           );
         }
-        const tpout = spawnSync("./uiCA", uiCAArgs).stdout.toString();
+        // "uiCA.py" is in PATH, see "./CryptOpt"-wrapper start script
+        const tpout = spawnSync("uiCA.py", uiCAArgs).stdout.toString();
 
         const tp = Number(tpout);
         if (isNaN(tp)) {

test/optimiser/measure.class.ts

@@ -120,6 +120,8 @@ describe("lengthMeasure", () => {
 });
 
 describe("uiCAMeasure", () => {
+  // this is what, in production, the ./CryptOpt wrapper script does.
+  vi.stubEnv("PATH", `${process.env.PATH}:${process.env.PWD}/bins/uiCA`);
   it("should use the uica lib and error out if no arch is specified.", () => {
     const mu = new MeasureUtil(
       undefined as unknown as Measuresuite,