updated readme

README.md

@@ -35,52 +35,65 @@ eval $(opam env)
 ```bash
   opam repo add coq-released https://coq.inria.fr/opam/released
   opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev
-  opam repo add tweetnacl git://github.com/ildyria/opam-repository.git
+  opam repo add tweetnacl git://gitlab.science.ru.nl/benoit/tweetnacl/
   opam update
   # if you want coqide
-  opam install coqide
+  opam install coqide.8.8.2
   # install the two main repository
   opam install coq-vst.2.0
-  opam install --deps-only coq-tweetnacl
+  opam install --deps-only coq-verif-tweetnacl
 ```
 
 ##### 4. Install TweetNacl Mathematical model
 
+To compile manually:
+
 ```bash
-  git clone https://gitlab.science.ru.nl/benoit/Tweetnacl.git Tweetnacl
-  cd Tweetnacl
-  # create a pin of Tweetnacl
-  opam pin add -n coq-tweetnacl .
+  cd proofs/spec/
+  # create a pin of coq-tweetnacl-spec
+  opam pin add -n coq-tweetnacl-spec .
+  ./configure.sh
   make -j
-  cd ..
-  opam install coq-tweetnacl
+  # if you want to compile the verification with VST
+  make install
 ```
 
-Another possibility is to use `opam source`. This will create a
-`coq-tweetnacl.dev` repo in your current directory
-(equivalent of `git clone`).
+If you want to let opam do the job:
+
+```bash
+  cd proofs/spec/
+  # create a pin of coq-tweetnacl-spec
+  opam pin add -n coq-tweetnacl-spec .
+  opam install coq-tweetnacl-spec
+```
 
+##### 5. Install TweetNacl Verification
+
+To compile manually:
 
 ```bash
-  opam source coq-tweetnacl --pin
-  cd coq-tweetnacl.dev
+  cd proofs/vst/
+  # create a pin of coq-tweetnacl-spec
+  opam pin add -n coq-tweetnacl-spec .
   ./configure.sh
   make -j
-  cd ..
-  opam install coq-tweetnacl
+  # if you want to compile the verification with VST
+  make install
 ```
 
-##### 5. Install TweetNacl_verif (optional)
+If you want to let opam do the job:
 
 ```bash
-  git clone https://gitlab.science.ru.nl/benoit/Tweetnacl_verif.git Tweetnacl_verif
-  cd Tweetnacl_verif
-  ./configure.sh
-  make -j
+  cd proofs/spec/
+  # create a pin of coq-tweetnacl-vst
+  opam pin add -n coq-tweetnacl-vst .
+  opam install coq-tweetnacl-vst
 ```
 
 ##### Benchmarks
 
+**NEED TO BE REDONE**
+
 ```
 Tweetnacl: make all -j  396.46s user 13.92s system 266% cpu 2:33.77 total
 Tweetnacl_verif: make -j  2164.06s user 12.94s system 227% cpu 15:58.79 total

makefile

 all: coq-tweetnacl-spec coq-tweetnacl-vst
 
-
 coq-tweetnacl-spec:
 	cd proofs/spec ;\
 	./configure.sh ;\

packages/coq-tweetnacl-spec/coq-tweetnacl-spec.dev/opam

@@ -25,7 +25,7 @@ author: [
   "timmy@timmyweerwag.nl"
   ]
 description: """
-Model to verify Tweetnacl
+Verifying the Tweetnacl implementation: Specification
 """
 url {
   src: "git+https://github.com/ildyria/coq-tweetnacl-verif/tree/master/proofs/spec"

packages/coq-tweetnacl-vst/coq-tweetnacl-vst.dev/opam

 opam-version: "2.0"
 name: "coq-tweetnacl-vst"
 maintainer: "benoit@cs.ru.nl"
-homepage: "https://gitlab.science.ru.nl/benoit/Tweetnacl_verif/"
+homepage: "https://gitlab.science.ru.nl/benoit/tweetnacl/"
 license: "MIT"
 build: [
   ["./configure.sh"]
@@ -12,9 +12,9 @@ install: [
 ]
 remove: ["rm" "-R" "%{lib}%/coq/user-contrib/Tweetnacl_verif"]
 depends: [
-  "coq" {>= "8.7.0"}
-  "coq-coqprime"
-  "coq-stdpp"
+  "coq" {>= "8.7.0" & < "8.9"}
+  "coq-coqprime" {= "1.0.3"}
+  "coq-stdpp" {= "1.1.0"}
   "coq-ssr-elliptic-curves"
   "coq-mathcomp-ssreflect"
   "coq-vst" {= "2.0"}
@@ -24,7 +24,7 @@ author: [
   "benoit@cs.ru.nl"
   ]
 description: """
-Verifying the Tweetnacl implementation with VST
+Verifying the Tweetnacl implementation: VST
 """
 url {
   src: "git+https://github.com/ildyria/coq-tweetnacl-verif/master/tree/proofs/vst"

packages/coq-tweetnacl-verif/coq-tweetnacl-verif.dev/opam → packages/coq-verif-tweetnacl/coq-verif-tweetnacl.dev/opam

 opam-version: "2.0"
 name: "coq-tweetnacl-verif"
 maintainer: "benoit@cs.ru.nl"
-homepage: "https://gitlab.science.ru.nl/benoit/Tweetnacl_verif/"
+homepage: "https://gitlab.science.ru.nl/benoit/tweetnacl/"
 license: "MIT"
 build: []
 install: [
@@ -22,8 +22,8 @@ author: [
   "benoit@cs.ru.nl"
   ]
 description: """
-Verifying the Tweetnacl implementation with VST
+Verifying the Tweetnacl implementation
 """
 url {
-  src: "git+https://github.com/ildyria/coq-tweetnacl-verif/"
+  src: "git+https://gitlab.science.ru.nl/benoit/tweetnacl/"
 }

proofs/spec/opam

@@ -25,7 +25,7 @@ author: [
   "timmy@timmyweerwag.nl"
   ]
 description: """
-Model to verify Tweetnacl
+Verifying the Tweetnacl implementation: Specification
 """
 url {
   src: "git+https://github.com/ildyria/coq-tweetnacl-verif/tree/master/proofs/spec"

proofs/vst/README.md

-# PROOFS of correctness of Curve25519
-
-1. Set up the environment as explained here:
-	[https://gitlab.science.ru.nl/benoit/tweetnacl](https://gitlab.science.ru.nl/benoit/tweetnacl).
-
-2. Download that repo:
-	`git clone https://gitlab.science.ru.nl:benoit/Tweetnacl_verif.git`
-
-3. Do `./configure.sh` followed by  `make`.
-
-```sh
-make -j  2164.06s user 12.94s system 227% cpu 15:58.79 total
-```
-

proofs/vst/opam

 opam-version: "2.0"
 name: "coq-tweetnacl-vst"
 maintainer: "benoit@cs.ru.nl"
-homepage: "https://gitlab.science.ru.nl/benoit/Tweetnacl_verif/"
+homepage: "https://gitlab.science.ru.nl/benoit/tweetnacl/"
 license: "MIT"
 build: [
   ["./configure.sh"]
@@ -24,7 +24,7 @@ author: [
   "benoit@cs.ru.nl"
   ]
 description: """
-Verifying the Tweetnacl implementation with VST
+Verifying the Tweetnacl implementation: VST
 """
 url {
   src: "git+https://github.com/ildyria/coq-tweetnacl-verif/master/tree/proofs/vst"

repo

 opam-version: "2.0"
-upstream: "https://github.com/ildyria/coq-tweetnacl-verif/tree/master/"
+upstream: "https://gitlab.science.ru.nl/benoit/tweetnacl/"
 browse: ""