Merge pull request borgbackup#7817 from bket/openssl-3.0

OpenBSD only: switch to OpenSSL-3.0
bket · Sep 12, 2023 · 6bb24de · 6bb24de
2 parents 9986bcc + 83d4fca
commit 6bb24de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -79,7 +79,7 @@ def packages_openbsd
     pkg_add lz4
     pkg_add zstd
     pkg_add git  # no fakeroot
-    pkg_add openssl%1.1
+    pkg_add openssl%3.0
     pkg_add py3-pip
     pkg_add py3-virtualenv
   EOF

diff --git a/setup.py b/setup.py
@@ -161,8 +161,8 @@ def lib_ext_kwargs(pc, prefix_env_var, lib_name, lib_pkg_name, pc_version, lib_s
         # Use openssl (not libressl) because we need AES-OCB via EVP api. Link
         # it statically to avoid conflicting with shared libcrypto from the base
         # OS pulled in via dependencies.
-        crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl11"]}
-        crypto_extra_objects += ["/usr/local/lib/eopenssl11/libcrypto.a"]
+        crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl30"]}
+        crypto_extra_objects += ["/usr/local/lib/eopenssl30/libcrypto.a"]
     else:
         crypto_ext_lib = lib_ext_kwargs(pc, "BORG_OPENSSL_PREFIX", "crypto", "libcrypto", ">=1.1.1")