Merge branch 'afromher_merge' into afromher_merge_dev

.docker/build/build.sh

@@ -160,7 +160,7 @@ function refresh_hints() {
     local hints_dir="$4"
 
     # Figure out the branch
-    CI_BRANCH=$branchname
+    CI_BRANCH=${branchname##refs/heads/}
     echo "Current branch_name=$CI_BRANCH"
 
     # Add all the hints, even those not under version control
@@ -185,8 +185,16 @@ function refresh_hints() {
     # Silent, always-successful merge
     export GIT_MERGE_AUTOEDIT=no
     git merge $commit -Xtheirs
+
+    # If build hints branch exists on remote, remove it
+    exists=$(git branch -r -l "origin/BuildHints-$CI_BRANCH")
+    if [ ! -z $exists ]; then
+        git push $remote :BuildHints-$CI_BRANCH
+    fi
+
     # Push.
-    git push $remote $CI_BRANCH
+    git checkout -b BuildHints-$CI_BRANCH
+    git push $remote BuildHints-$CI_BRANCH
 }
 
 function exec_build() {
@@ -195,7 +203,7 @@ function exec_build() {
     local status_file="../status.txt"
     echo -n false >$status_file
 
-    if [ ! -d "providers" ]; then
+    if [ ! -d "secure_api" ]; then
         echo "I don't seem to be in the right directory, bailing"
         echo Failure >$result_file
         return

.gitattributes

@@ -13,10 +13,5 @@ configure eol=lf
 *.sh text eol=lf
 *.fst eol=lf
 *.fsti eol=lf
-*.fs* eol=lf
 *.ml* eol=lf
 *.hints eol=lf -diff linguist-generated
-
-# Checked modules
-*.checked binary
-*.checked.lax binary

.gitignore

@@ -10,101 +10,18 @@
 *.cmx
 *.cmxa
 out.krml
-.depend
-.output
-
-hacl-star.tar.gz
-
-build/
-build-experimental/
-
-test/basics/c-test
-test/basics/ml-test
-test/hash/sha256
-test/hmac/ml/*
-test/hmac/hmac_sha256
-test/bench.txt
-
-pneutube/tube-star.exe
-pneutube/tube-star.exe.dSYM/
-pneutube/tube/
-
-lib/tutorial/test-c/
-
-specs/*-ml/
-
-code/lib/kremlin/ccomp-c/
-code/lib/kremlin/lib-c/
-
-code/blake2s/blake2s-c/
-code/blake2b/blake2b-c/
-code/chacha20/chacha20-c/
-code/chacha20poly1305/chacha20poly1305-c/
-code/curve25519/curve25519-c/
-code/curve25519/tmp_25519.h
-code/experimental/aes-gcm/aesgcm-m32-c/
-code/experimental/aes-gcm/aesgcm-ni-c/
-code/experimental/gf128/gf128-c/
-code/sha3/sha3-c
-code/hash/hash-c/
-code/hash/sha2-c/
-code/hash/sha2-c-test/
-code/hash/sha2-256-c/
-code/hash/sha2-384-c/
-code/hash/sha2-512-c/
-code/hash/blake2s-c/
-code/hmac/hmac-sha256-c/
-code/hmac/hmac-sha384-c/
-code/hmac/hmac-sha512-c/
-code/api/aead-c/
-code/api/box-c/
-code/api/policies-c/
-code/curve25519/x25519-c/
-code/ed25519/ed25519-c/
-code/nacl-box/NaCl_Box-c/
-code/poly1305/poly-c/
-code/poly1305_32/poly-c/
-code/salsa20/salsa20-c/
-code/salsa-family/vec128.h
-code/salsa-family/chacha-c/
-code/salsa-family/chacha-vec128/
-code/salsa-family/chacha-vec128-c/
-code/salsa-family/hsalsa-c/
-code/salsa-family/salsa-c/
-code/salsa-family/xsalsa-c/
-code/mpfr/mpfr-c/
-
-providers/.cache
-providers/.depend
-providers/.output
-providers/generated
-providers/out
-providers/multiplexer/ml/*.cm?
-
-secure_api/.depend.*
-secure_api/LowCProvider/*.cm?
-secure_api/out
-secure_api/tmp-hacl/
-secure_api/tmp-vale/
-
-snapshots/hacl-c/bench.txt
-snapshots/hacl-c/libhacl.*
-snapshots/hacl-c/libhacl32.*
-snapshots/snapshot-gcc
-snapshots/snapshot-gcc-unrolled
-snapshots/snapshot-compcert
-snapshots/snapshot-compcert-unrolled
-snapshots/snapshot-msvc
-snapshots/snapshot-msvc-unrolled
-snapshots/nss
-snapshots/riot
-snapshots/wireguard
-
-doc/tutorial/0-coding-field-arithmetic-in-fstar/extracted_c/
-doc/tutorial/1-recursion-vs-loops/extracted_c/
-doc/tutorial/2-verifying-memory-safety/extracted_c/
-doc/tutorial/4-verifying-functional-correctness/extracted_c/
-
-dependencies
-*.checked.lax
 *.checked
+*.checked.lax
+*.dump
+.extracted
+.*depend*
+code/old/**/*-c
+code/old/**/*-c89
+.evercrypt_config
+dist
+!dist/Makefile
+*.orig
+.didhelp
+.last_vale_version
+Makefile.config
+.#*