Merge pull request #7817 from bket/openssl-3.0

OpenBSD only: switch to OpenSSL-3.0
This commit is contained in:
TW 2023-09-12 17:36:30 +02:00 committed by GitHub
commit 6bb24ded05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

2
Vagrantfile vendored
View File

@ -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

View File

@ -161,8 +161,8 @@ if not on_rtd:
# 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")