merge and update

* merge branch 'main' into pnmadelaine-update * update to HACL* 45b18730573d3404a57fb63767570cb97897a75f
cryspen · Nov 7, 2023 · dfdf26a · dfdf26a
2 parents 83d7130 + 4d3ac1c
commit dfdf26a
Show file tree

Hide file tree

Showing 528 changed files with 70,307 additions and 61,019 deletions.
diff --git a/.clabot b/.clabot
@@ -7,7 +7,11 @@
     "duesee": "Cryspen",
     "pnmadelaine": "Inria - Prosecco",
     "addressxception": "InfernoRed",
-    "bkmgit": ""
+    "bkmgit": "",
+    "mamonet": "",
+    "emillon": "",
+    "protz": "",
+    "ma-ilsi": ""
   },
   "contributors": [
     "franziskuskiefer",
@@ -17,6 +21,10 @@
     "pnmadelaine",
     "addressxception",
     "bkmgit",
-    "mgstoyanov"
+    "mgstoyanov",
+    "mamonet",
+    "emillon",
+    "protz",
+    "ma-ilsi"
   ]
 }
diff --git a/.drone.yml b/.drone.yml
@@ -1,18 +1,18 @@
-kind: pipeline
-type: docker
-name: arm64
-
-platform:
-  arch: arm64
-
-steps:
-- name: test
-  image: ubuntu:20.04
-  commands:
-  - ./.ci/kitware-archive.sh
-  - apt-get update -qq --yes && apt-get install -qq --yes clang cmake ninja-build python3
-  - ./mach build --test -v -c
-  - ./mach build --release --test -v -c
+# kind: pipeline
+# type: docker
+# name: arm64
+# 
+# platform:
+#   arch: arm64
+# 
+# steps:
+# - name: test
+#   image: ubuntu:20.04
+#   commands:
+#   - ./.ci/kitware-archive.sh
+#   - apt-get update -qq --yes && apt-get install -qq --yes clang cmake ninja-build python3
+#   - ./mach build --test -v -c
+#   - ./mach build --release --test -v -c
 
 # ---
 # Doesn't work right now "At least one invalid signature was encountered"

diff --git a/.github/workflows/benchmark_pull_request.yml b/.github/workflows/benchmark_pull_request.yml
@@ -6,6 +6,7 @@ on:
       - 'hacl-star-**'
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 jobs:
   default:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
     paths-ignore:
       - .gitignore
       - CLA.md
@@ -14,34 +15,32 @@ on:
       - LICENSE-APACHE
       - README.md
   workflow_dispatch:
+  merge_group:
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         compiler: [gcc, clang]
-        version: [7, 8, 9, 10, 11, 12, 13, 14]
+        version: [9, 10, 11, 12, 13, 14]
         bits: [32, 64]
         edition: [""] # ignore c89 for now
-        #edition: [ c89, "" ]
         exclude:
-          - compiler: gcc
-            version: 12
           - compiler: gcc
             version: 13
           - compiler: gcc
             version: 14
-          # Not available
           - compiler: clang
-            version: 13
-          # Not available
+            version: 9
           - compiler: clang
-            version: 14
+            version: 10
 
     steps:
       - name: Setup | Update
@@ -86,26 +85,30 @@ jobs:
         with:
           bits: ${{ matrix.bits }}
           edition: ${{ matrix.edition }}
-          args: "--no-openssl" # Ubuntu 20.04 doesn't have OpenSSL3
 
       - name: Upload artifacts
         uses: ./.github/actions/upload_artifacts
         with:
           name: linux_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.edition }}
 
   macos:
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
     runs-on: macos-latest
     strategy:
       matrix:
         compiler: [gcc, clang]
-        version: [11, 12, 13, 14]
+        version: [11, 12, 13, 14, 15]
         bits: [64]
         target: ["", "aarch64-apple-ios", "aarch64-apple-darwin"]
         exclude:
           - compiler: gcc
             version: 13
           - compiler: gcc
             version: 14
+          - compiler: gcc
+            version: 15
+          - compiler: clang
+            version: 11
 
     steps:
       - name: Setup | Install Ninja
@@ -148,19 +151,19 @@ jobs:
           target: ${{ matrix.target }}
 
       - name: mach | Benchmark
+        if: ${{ matrix.target == '' }} # Only run benchmarks on the native build.
         uses: ./.github/actions/mach_benchmark
         with:
           bits: ${{ matrix.bits }}
           target: ${{ matrix.target }}
-          args: "--no-openssl" # FIXME: #198 For some reason openssl isn't work
-          environment: OPENSSL_HOME=/usr/local/opt/openssl@3/
 
       - name: Upload artifacts
         uses: ./.github/actions/upload_artifacts
         with:
           name: macos_${{ matrix.compiler }}_v${{ matrix.version }}_${{ matrix.bits }}_${{ matrix.target }}
 
   windows:
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
     runs-on: windows-latest
     strategy:
       matrix:
@@ -213,6 +216,7 @@ jobs:
   # ----------------------------------------------------------------------------
 
   android:
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -239,6 +243,7 @@ jobs:
           name: ${{ matrix.target }}
 
   s390x-gcc:
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -273,6 +278,7 @@ jobs:
   # ----------------------------------------------------------------------------
 
   default:
+    if: ${{ github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
@@ -3,7 +3,7 @@ name: build_pull_request
 on:
   push:
     branches:
-      - 'hacl-star-**'
+      - "hacl-star-**"
   pull_request:
     paths-ignore:
       - .gitignore
@@ -15,6 +15,7 @@ on:
       - LICENSE-APACHE
       - README.md
   workflow_dispatch:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,8 +28,7 @@ jobs:
       matrix:
         compiler: [gcc, clang]
         bits: [32, 64]
-        edition: [""] # ignore c89 for now
-        #edition: [ c89, "" ]
+        edition: [""]
 
     steps:
       - name: Setup | Update
@@ -116,12 +116,11 @@ jobs:
           target: ${{ matrix.target }}
 
       - name: mach | Benchmark
+        if: ${{ matrix.target == '' }} # Only run benchmarks on the native build.
         uses: ./.github/actions/mach_benchmark
         with:
           bits: ${{ matrix.bits }}
           target: ${{ matrix.target }}
-          args: "--no-openssl" # FIXME: #198 For some reason openssl isn't work
-          environment: OPENSSL_HOME=/usr/local/opt/openssl@3/
 
       - name: Upload artifacts
         uses: ./.github/actions/upload_artifacts

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
     paths-ignore:
       - .gitignore
       - CLA.md
@@ -25,6 +26,7 @@ on:
       - LICENSE-APACHE
       - README.md
   workflow_dispatch:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
     paths-ignore:
       - .gitignore
       - CLA.md
@@ -15,6 +16,7 @@ on:
       - README.md
   workflow_dispatch:
   pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -95,25 +95,27 @@ jobs:
           dune build @doc --only-packages=hacl-star
           cp -r _build/default/_doc/_html/* ../build/ocaml/main/
 
-      - name: Build | OCaml API Reference for Tags
-        run: |
-          mkdir -p build/ocaml
-          for branch in $(git for-each-ref --format='%(refname)' refs/tags/); do
-            if [[ "$branch" == *"ocaml-"* ]]; then
-              rm -rf opam
-              tag=$(echo $branch | cut -d'/' -f 3)
-              git checkout $tag
-              echo "Building documentation for $tag"
-              mkdir -p build/ocaml/$tag
-              ./opam.sh
-              cd opam
-              eval $(opam env)
-              opam install . --yes
-              dune build @doc --only-packages=hacl-star
-              cp -r _build/default/_doc/_html/* ../build/ocaml/$tag/
-              cd ../
-            fi
-          done
+      # TODO: #423 ctypes.stubs need to be added to old tags to build documentation.
+      #       https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf
+      # - name: Build | OCaml API Reference for Tags
+      #   run: |
+      #     mkdir -p build/ocaml
+      #     for branch in $(git for-each-ref --format='%(refname)' refs/tags/); do
+      #       if [[ "$branch" == *"ocaml-"* ]]; then
+      #         rm -rf opam
+      #         tag=$(echo $branch | cut -d'/' -f 3)
+      #         git checkout $tag
+      #         echo "Building documentation for $tag"
+      #         mkdir -p build/ocaml/$tag
+      #         ./opam.sh
+      #         cd opam
+      #         eval $(opam env)
+      #         opam install . --yes
+      #         dune build @doc --only-packages=hacl-star
+      #         cp -r _build/default/_doc/_html/* ../build/ocaml/$tag/
+      #         cd ../
+      #       fi
+      #     done
 
       - name: Build | JS API Reference
         run: |

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - dev
       - 'hacl-star-**'
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 jobs:
    default:

diff --git a/.github/workflows/ocaml.yml b/.github/workflows/ocaml.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
       - 'hacl-star-**'
     paths-ignore:
       - .gitignore
@@ -26,6 +27,7 @@ on:
       - LICENSE-APACHE
       - README.md
   workflow_dispatch:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}