Remove some final bits

randombit · Oct 24, 2021 · dc82c81 · dc82c81
1 parent cc76eab
commit dc82c81
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/src/lib/pubkey/pk_algs.cpp b/src/lib/pubkey/pk_algs.cpp
@@ -406,11 +406,6 @@ probe_provider_private_key(const std::string& alg_name,
       {
       if(prov == "base")
          providers.push_back(prov);
-
-#if defined(BOTAN_HAS_OPENSSL)
-      if(prov == "openssl" && alg_name == "RSA")
-         providers.push_back(prov);
-#endif
       }
 
    BOTAN_UNUSED(alg_name);

diff --git a/src/scripts/ci/lgtm.yml b/src/scripts/ci/lgtm.yml
@@ -30,4 +30,4 @@ extraction:
   cpp:
     configure:
       command:
-        - ./configure.py --build-targets="static,shared,cli,tests,bogo_shim" --build-fuzzers=test --with-zlib --with-bzip2 --with-lzma --with-openssl --with-sqlite3 --no-store-vc-rev --without-documentation
+        - ./configure.py --build-targets="static,shared,cli,tests,bogo_shim" --build-fuzzers=test --with-zlib --with-bzip2 --with-lzma --with-sqlite3 --no-store-vc-rev --without-documentation
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
@@ -250,12 +250,6 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin,
         if target_os == 'linux':
             flags += ['--with-lzma']
 
-        if target_os == 'linux':
-            if target not in ['sanitizer', 'valgrind', 'minimized']:
-                # Avoid OpenSSL when using dynamic checkers, or on OS X where it sporadically
-                # is not installed on the CI image
-                flags += ['--with-openssl']
-
         if target in ['coverage']:
             flags += ['--with-tpm']
             test_cmd += ['--run-online-tests']

diff --git a/src/tests/main.cpp b/src/tests/main.cpp
@@ -14,10 +14,6 @@
 
 #include <botan/version.h>
 
-#if defined(BOTAN_HAS_OPENSSL)
-   #include <botan/internal/openssl.h>
-#endif
-
 namespace {
 
 std::string help_text(const std::string& spec)
@@ -100,24 +96,9 @@ int main(int argc, char* argv[])
          parser.flag_set("run-long-tests"),
          parser.flag_set("abort-on-first-fail"));
 
-#if defined(BOTAN_HAS_OPENSSL)
-      if(opts.provider().empty() || opts.provider() == "openssl")
-         {
-         ::ERR_load_crypto_strings();
-         }
-#endif
-
       Botan_Tests::Test_Runner tests(std::cout);
 
-      int rc = tests.run(opts);
-
-#if defined(BOTAN_HAS_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x01010000)
-      if(opts.provider().empty() || opts.provider() == "openssl")
-         {
-         ERR_free_strings();
-         ::ERR_remove_thread_state(nullptr);
-         }
-#endif
+      const int rc = tests.run(opts);
 
       return rc;
       }