Merge pull request #5779 from larsewi/unsupported-3.21.x

Upgrade workflow from unsupported platform (3.21.x)

Author: craigcomstock

.github/workflows/acceptance_tests.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   acceptance_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:

.github/workflows/asan_unit_tests.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   asan_unit_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -17,4 +17,4 @@ jobs:
     - name: Compile and link (make)
       run: make -j8 CFLAGS="-Werror -Wall -fsanitize=address" LDFLAGS="-fsanitize=address"
     - name: Run unit tests
-      run: make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check
+      run: ASAN_OPTIONS=detect_odr_violation=0 LSAN_OPTIONS="suppressions=../../.github/workflows/suppr.txt" make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check

.github/workflows/shellcheck.yml

@@ -4,7 +4,7 @@ on:
 jobs:
   unit_tests:
     name: Run shellcheck on shell scripts
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:

.github/workflows/suppr.txt

@@ -0,0 +1 @@
+leak:crypto

.github/workflows/unit_tests.yml

@@ -4,7 +4,7 @@ on:
 jobs:
   unit_tests:
     name: Run Unit Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:

libpromises/crypto.c

@@ -63,6 +63,11 @@ static void CleanupOpenSSLThreadLocks(void);
 
 static bool crypto_initialized = false; /* GLOBAL_X */
 
+#if OPENSSL_VERSION_NUMBER > 0x30000000
+static OSSL_PROVIDER *legacy_provider = NULL;
+static OSSL_PROVIDER *default_provider = NULL;
+#endif
+
 const char *CryptoLastErrorString()
 {
     const char *errmsg = ERR_reason_error_string(ERR_get_error());
@@ -114,6 +119,20 @@ void CryptoDeInitialize()
         EVP_cleanup();
         CleanupOpenSSLThreadLocks();
         ERR_free_strings();
+
+#if OPENSSL_VERSION_NUMBER > 0x30000000
+        if (legacy_provider != NULL)
+        {
+            OSSL_PROVIDER_unload(legacy_provider);
+            legacy_provider = NULL;
+        }
+        if (default_provider != NULL)
+        {
+            OSSL_PROVIDER_unload(default_provider);
+            default_provider = NULL;
+        }
+#endif
+
         crypto_initialized = false;
     }
 }