9 files changed, 92 insertions, 81 deletions

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index e1bfcb0..7b01aa4 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -1,48 +1,65 @@
-name: Coverity
+# GitHub Actions workflow to run Coverity scans.
+name: "Coverity"
 
 on:
   workflow_dispatch:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *" # At 00:00 daily.
 
 jobs:
   scan:
-    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'libressl' }}
+    name: "Scan"
+    runs-on: "ubuntu-latest"
+    if: github.repository_owner == 'libressl' # Prevent running on forks
+    permissions:
+      contents: read
     steps:
-    - uses: actions/checkout@main
-    - name: Install apt dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y cmake ninja-build
-    - name: Download Coverity build tool
-      run: |
-        wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=libressl-portable%2Fportable" -O coverity_tool.tar.gz
-        mkdir coverity_tool
-        tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
-    - name: Configure
-      run: |
-        ./autogen.sh
-        ./configure
-        make dist
-        tar zxf libressl-*.tar.gz
-        rm libressl-*.tar.gz
-        cd libressl-*
-        mkdir build-static
-        mkdir build-shared 
-        cmake -GNinja -DBUILD_SHARED_LIBS=ON ..
-    - name: Build with Coverity build tool
-      run: |
-        export PATH=`pwd`/coverity_tool/bin:$PATH
-        cd libressl-*
-        cov-build --dir cov-int ninja
-    - name: Submit build result to Coverity Scan
-      run: |
-        cd libressl-*
-        tar czvf cov.tar.gz cov-int
-        curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
-          --form email=libressl-security@openbsd.org \
-          --form file=@cov.tar.gz \
-          --form version="Commit $GITHUB_SHA" \
-          --form description="Build submitted via CI" \
-          https://scan.coverity.com/builds?project=libressl-portable%2Fportable
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+
+      - name: "Install dependencies"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake ninja-build
+
+      - name: "Download Coverity build tool"
+        env:
+          PROJECT: "libressl-portable%2Fportable"
+          COVERITY_SCAN_TOKEN: "${{ secrets.COVERITY_SCAN_TOKEN }}"
+        run: |
+          wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$PROJECT" -O coverity_tool.tar.gz
+          mkdir coverity_tool
+          tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
+
+      - name: "Setup"
+        run: |
+          ./autogen.sh
+          ./configure
+          make dist
+          tar zxf libressl-*.tar.gz
+          rm libressl-*.tar.gz
+          cd libressl-*
+          mkdir build-static
+          mkdir build-shared 
+          cmake -GNinja -DBUILD_SHARED_LIBS=ON ..
+
+      - name: "Build with Coverity build tool"
+        run: |
+          export PATH=`pwd`/coverity_tool/bin:$PATH
+          cd libressl-*
+          cov-build --dir cov-int ninja
+
+      - name: "Submit build result to Coverity Scan"
+        env:
+          EMAIL: "libressl-security@openbsd.org"
+          PROJECT: "libressl-portable%2Fportable"
+          COVERITY_SCAN_TOKEN: "${{ secrets.COVERITY_SCAN_TOKEN }}"
+        run: |
+          cd libressl-*
+          tar czvf cov.tar.gz cov-int
+          curl --form token=$COVERITY_SCAN_TOKEN \
+            --form email=$EMAIL \
+            --form file=@cov.tar.gz \
+            --form version="Commit $GITHUB_SHA" \
+            --form description="Build submitted via CI" \
+            https://scan.coverity.com/builds?project=$PROJECT
diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml
new file mode 100644
index 0000000..2c6ee49
--- /dev/null
+++ b/.github/workflows/solaris.yml
@@ -0,0 +1,32 @@
+# GitHub Actions workflow to run tests on a Solaris VM.
+name: "Solaris"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *" # At 00:00 daily.
+
+jobs:
+  test:
+    name: "Solaris"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+
+      - name: "Setup"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y automake autoconf libtool
+          ./autogen.sh
+
+      - name: "Build on VM"
+        uses: vmactions/solaris-vm@v1
+        with:
+          prepare: |
+            pkg install gcc make
+          run: |
+            MAKE=gmake ./configure
+            gmake -j2 check || (cat tests/test-suite.log && exit 1)
diff --git a/.github/workflows/solaris_test.yml b/.github/workflows/solaris_test.yml
deleted file mode 100644
index 6470278..0000000
--- a/.github/workflows/solaris_test.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: solaris_ci
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-native:
-    strategy:
-      matrix:
-        release: [11.4]
-    runs-on: ubuntu-latest
-    continue-on-error: false
-    name: Solaris ${{ matrix.release }}
-    steps:
-    - name: Checkout source
-      uses: actions/checkout@main
-    - name: Configure source
-      run: |
-        brew install automake autoconf libtool
-        ./autogen.sh
-    - name: Build on VM
-      uses: vmactions/solaris-vm@v1
-      with:
-        prepare: |
-          pkg install gcc make
-        run: |
-          MAKE=gmake ./configure
-          gmake -j2 check || (cat tests/test-suite.log && exit 1)
diff --git a/.gitignore b/.gitignore
index bdae627..b061ae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,7 +120,6 @@ tests/ssl_methods*
 tests/ssl_set_alpn_protos*
 tests/ssl_verify_param*
 tests/ssl_versions*
-tests/string_table*
 tests/timingsafe*
 tests/tls_ext_alpn*
 tests/tls_prf*
diff --git a/README.md b/README.md
index 009efd5..c623fe9 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 [![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux.yml)
 [![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos.yml)
 [![Android Build Status](https://github.com/libressl/portable/actions/workflows/android.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android.yml)
+[![Solaris Build Status](https://github.com/libressl/portable/actions/workflows/solaris.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/solaris.yml)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl)
 
 LibreSSL is a fork of [OpenSSL](https://www.openssl.org) 1.0.1g developed by the
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d545325..bf1e1c2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -931,6 +931,8 @@ elseif(HOST_I386)
         target_include_directories(crypto_obj PRIVATE bn/arch/i386/)
 elseif(HOST_MIPS64)
         target_include_directories(crypto_obj PRIVATE bn/arch/mips64)
+elseif(HOST_MIPS)
+        target_include_directories(crypto_obj PRIVATE bn/arch/mips)
 elseif(HOST_POWERPC)
         target_include_directories(crypto_obj PRIVATE bn/arch/powerpc)
 elseif(HOST_POWERPC64)
diff --git a/man/links b/man/links
index f5ea0cb..17f9087 100644
--- a/man/links
+++ b/man/links
@@ -29,8 +29,6 @@ ASN1_INTEGER_get.3,BN_to_ASN1_INTEGER.3
 ASN1_NULL_new.3,ASN1_NULL_free.3
 ASN1_OBJECT_new.3,ASN1_OBJECT_create.3
 ASN1_OBJECT_new.3,ASN1_OBJECT_free.3
-ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_cleanup.3
-ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_get.3
 ASN1_STRING_length.3,ASN1_OCTET_STRING_cmp.3
 ASN1_STRING_length.3,ASN1_OCTET_STRING_dup.3
 ASN1_STRING_length.3,ASN1_OCTET_STRING_set.3
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aa00455..2beaa29 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -670,11 +670,6 @@ else()
 endif()
 set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
-# string_table
-add_executable(string_table string_table.c)
-target_link_libraries(string_table ${OPENSSL_TEST_LIBS})
-add_test(string_table string_table)
-
 # testdsa
 if(NOT MSVC)
         add_test(NAME testdsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d87bde..5ca0fe9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -698,11 +698,6 @@ EXTRA_DIST += server2-ecdsa.pem server2-rsa-chain.pem server2-rsa.pem
 EXTRA_DIST += server3-ecdsa-chain.pem server3-ecdsa.pem server3-rsa-chain.pem
 EXTRA_DIST += server3-rsa.pem
 
-# string_table
-TESTS += string_table
-check_PROGRAMS += string_table
-string_table_SOURCES = string_table.c
-
 # testdsa
 TESTS += testdsa.sh
 EXTRA_DIST += testdsa.sh testdsa.bat