diff --git a/marzipan/TODO.md b/marzipan/TODO.md index 8a53e92..57ecf37 100644 --- a/marzipan/TODO.md +++ b/marzipan/TODO.md @@ -1,14 +1,16 @@ # TODO for the project of rewriting Marzipan -## Next steps +## Done * ~~figure out why ProVerif is started on the non-processed mpv file~~ * ~~rework rebound warnings (`clean_warnings` Bash function)~~ ```bash rosenpass$ rosenpass-marzipan run-proverif target/proverif/03_identity_hiding_responder.entry.o.pv target/proverif/03_identity_hiding_responder.entry.log ``` +* ~~provide log parameter to `rosenpass-marzipan`-call~~ (no, it was intentionally not used) + +## Next Steps -* provide log parameter to `rosenpass-marzipan`-call * cpp pre-processing stuff * awk pre-processing stuff * `pretty_output` Bash function diff --git a/marzipan/src/__init__.py b/marzipan/src/__init__.py index ee0f700..e6fdf01 100644 --- a/marzipan/src/__init__.py +++ b/marzipan/src/__init__.py @@ -20,9 +20,8 @@ def exc(argv, **kwargs): @click.command() @click.argument("file") -@click.argument("log") @click.argument("extra_args", required=False) -def run_proverif(file, log, extra_args=[]): +def run_proverif(file, extra_args=[]): if extra_args is None: extra_args = [] params = ["proverif", "-test", *extra_args, file] diff --git a/marzipan/src/analyze.sh b/marzipan/src/analyze.sh index 5880b00..1d591a4 100755 --- a/marzipan/src/analyze.sh +++ b/marzipan/src/analyze.sh @@ -7,10 +7,9 @@ exc() { run_proverif() { local file; file="$1"; shift - local log; log="$1"; shift - #exc proverif -test "${@}" "${file}" 2>&1 + local log; log="$1"; shift # intentionally unused - exc rosenpass-marzipan run-proverif "${file}" "${log}" "${@}" + exc rosenpass-marzipan run-proverif "${file}" "${@}" } clean_warnings() {