Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore a libcrypto.dylib with the wrong architecture #84

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

Ignore a libcrypto.dylib with the wrong architecture #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion oscrypto/_mac/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ def pkcs12_kdf(hash_algorithm, password, salt, iterations, key_length, id_):

return bytes_from_buffer(output_buffer)

except (LibraryNotFoundError):
except (LibraryNotFoundError, OSError):
# OpenSSL no longer ships with macOS. If you install Homebrew with arch -x86_64, you end
# up with a /usr/local/lib/libcrypto.dylib that will not work with an arm64 Python, and
# will fail to load with an OSError. In that case, we should still fall back as if it
# were missing.

from .._pkcs12 import pkcs12_kdf