Skip to content

Commit

Permalink
jazzcheck → jazzct
Browse files Browse the repository at this point in the history
  • Loading branch information
vbgl authored and bgregoir committed Mar 25, 2024
1 parent 7ef5c72 commit 90197cd
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ocaml:
- compiler/_build/
- compiler/jasminc
- compiler/jazz2tex
- compiler/jazzcheck
- compiler/jazzct

eclib:
stage: prove
Expand Down Expand Up @@ -144,7 +144,7 @@ opam-compiler:
nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run
'eval $(opam env) &&
make -C compiler -j$NIX_BUILD_CORES &&
(cd compiler && mkdir -p bin && cp _build/default/entry/jasminc.exe bin/jasminc && cp _build/default/entry/jazz2tex.exe bin/jazz2tex && cp _build/default/entry/jazzcheck.exe bin/jazzcheck && mkdir -p lib/jasmin/easycrypt && cp ../eclib/*.ec lib/jasmin/easycrypt/)'
(cd compiler && mkdir -p bin && cp _build/default/entry/jasminc.exe bin/jasminc && cp _build/default/entry/jazz2tex.exe bin/jazz2tex && cp _build/default/entry/jazzct.exe bin/jazzct && mkdir -p lib/jasmin/easycrypt && cp ../eclib/*.ec lib/jasmin/easycrypt/)'
artifacts:
paths:
- compiler/bin/
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
- Extraction as EasyCrypt code targets version 2024.01
([PR #690](https://github.com/jasmin-lang/jasmin/pull/690)).

- The Constant-Time security checker is now available as a separate `jazzcheck`
- The Constant-Time security checker is now available as a separate `jazzct`
tool; the `-checkCT`, `-checkCTon`, and `-infer` command line options are
deprecated
([PR #766](https://github.com/jasmin-lang/jasmin/pull/766)).
Expand Down
2 changes: 1 addition & 1 deletion compiler/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ report.log
/jasmin.mlpack
/jasminc
/jazz2tex
/jazzcheck
/jazzct
12 changes: 6 additions & 6 deletions compiler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ all: build
build: native

define do-build
$(RM) jasminc jazz2tex jazzcheck
dune build @check entry/jasminc.$(1) entry/jazz2tex.$(1) entry/jazzcheck.$(1)
$(RM) jasminc jazz2tex jazzct
dune build @check entry/jasminc.$(1) entry/jazz2tex.$(1) entry/jazzct.$(1)
ln -sf "_build/default/entry/jasminc.$(1)" jasminc
ln -sf "_build/default/entry/jazz2tex.$(1)" jazz2tex
ln -sf "_build/default/entry/jazzcheck.$(1)" jazzcheck
ln -sf "_build/default/entry/jazzct.$(1)" jazzct
endef

byte:
Expand All @@ -68,18 +68,18 @@ check-ci:

clean:
dune clean
$(RM) jasminc jazz2tex jazzcheck
$(RM) jasminc jazz2tex jazzct

install:
$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 -T jasminc $(DESTDIR)$(BINDIR)/jasminc
$(INSTALL) -m 0755 -T jazz2tex $(DESTDIR)$(BINDIR)/jazz2tex
$(INSTALL) -m 0755 -T jazzcheck $(DESTDIR)$(BINDIR)/jazzcheck
$(INSTALL) -m 0755 -T jazzct $(DESTDIR)$(BINDIR)/jazzct

uninstall:
$(RM) $(DESTDIR)$(BINDIR)/jasminc
$(RM) $(DESTDIR)$(BINDIR)/jazz2tex
$(RM) $(DESTDIR)$(BINDIR)/jazzcheck
$(RM) $(DESTDIR)$(BINDIR)/jazzct

# --------------------------------------------------------------------
dist: $(DISTDIR).tgz
Expand Down
2 changes: 1 addition & 1 deletion compiler/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stdenv.mkDerivation {

installPhase = ''
mkdir -p $out/bin
for p in jasminc jazz2tex jazzcheck
for p in jasminc jazz2tex jazzct
do
cp _build/default/entry/$p.exe $out/bin/$p
done
Expand Down
6 changes: 3 additions & 3 deletions compiler/dune
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
(libraries commonCLI))

(executable
(public_name jazzcheck)
(name jazzcheck)
(modules jazzcheck)
(public_name jazzct)
(name jazzct)
(modules jazzct)
(flags (:standard -rectypes))
(modes byte exe)
(libraries commonCLI))
Expand Down
2 changes: 1 addition & 1 deletion compiler/entry/jazzcheck.ml → compiler/entry/jazzct.ml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ let () =
]
in
let info =
Cmd.info "jazzcheck" ~version:Glob_options.version_string ~doc ~man
Cmd.info "jazzct" ~version:Glob_options.version_string ~doc ~man
in
Cmd.v info
Term.(const parse_and_check $ arch $ call_conv $ infer $ slice $ file)
Expand Down
2 changes: 1 addition & 1 deletion compiler/jasmin.opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ install: [
mkdir -p "%{prefix}%/bin"
cp "_build/default/entry/jasminc.exe" "%{prefix}%/bin/jasminc"
cp "_build/default/entry/jazz2tex.exe" "%{prefix}%/bin/jazz2tex"
cp "_build/default/entry/jazzcheck.exe" "%{prefix}%/bin/jazzcheck"
cp "_build/default/entry/jazzct.exe" "%{prefix}%/bin/jazzct"
mkdir -p "%{prefix}%/lib/jasmin/easycrypt"
sh -c "cp ../eclib/*.ec \"%{prefix}%/lib/jasmin/easycrypt/\""
]
Expand Down
2 changes: 1 addition & 1 deletion compiler/scripts/check-cct
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -ex

exec $(dirname $0)/../jazzcheck "$@"
exec $(dirname $0)/../jazzct "$@"
2 changes: 1 addition & 1 deletion compiler/src/CLI_errors.ml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ let check_options () =

if Option.is_some !ct_list || !infer
then warning Deprecated Location.i_dummy
"the command-line options for constant-time have been deprecated since April 2024; use [jazzcheck] instead";
"the command-line options for constant-time have been deprecated since March 2024; use [jazzct] instead";

List.iter chk_out_file [ outfile; latexfile; ecfile ]

0 comments on commit 90197cd

Please sign in to comment.