fixes compatibility with macos big sur. #47

TerminalFi · 2020-06-26T16:36:31Z

MacOS Big Sur had dynamic linker changes. Shared libraries are now stored only in /System/Library/dyld/dyld_shared_cache_x86_64 and no longer present on the actual file system. This changes makes the find_library not return the paths of the libraries such as find_library("ssl")

MacOS Big Sur had dynamic linker changes. Shared libraries are now stored only in `/System/Library/dyld/dyld_shared_cache_x86_64` and no longer present on the actual file system. This changes makes the `find_library` not return the paths of the libraries such as `find_library("ssl")`

wbond

I think we just need a few little tweaks making sure that we only set the OpenSSL paths if we didn't find anything.

oscrypto/_openssl/_libssl_ctypes.py

oscrypto/_openssl/_libssl_cffi.py

oscrypto/_openssl/_libcrypto_cffi.py

oscrypto/_openssl/_libcrypto_ctypes.py

FichteFoll · 2020-06-27T01:01:51Z

oscrypto/_openssl/_libcrypto_cffi.py

+        libcrypto_path == '/usr/lib/libcrypto.42.dylib'
    # if we are on macOS 10.15+, we want to strongly version libcrypto since unversioned libcrypto has a non-stable ABI
-    if sys.platform == 'darwin' and list(map(int, platform.mac_ver()[0].split('.')))[1] >= 15 and \
+    if sys.platform == 'darwin' and tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 15) and \


Should probably become an elif. While it running for 10.16+ doesn't change because the last condition won't apply, this seems more fragile than needs be.

FichteFoll · 2020-06-27T01:02:36Z

oscrypto/_openssl/_libcrypto_ctypes.py

+        libcrypto_path == '/usr/lib/libcrypto.42.dylib'
    # if we are on macOS 10.15+, we want to strongly version libcrypto since unversioned libcrypto has a non-stable ABI
-    if sys.platform == 'darwin' and list(map(int, platform.mac_ver()[0].split('.')))[1] >= 15 and \
+    if sys.platform == 'darwin' and tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 15) and \


Same as above.

FichteFoll · 2020-06-27T01:02:43Z

oscrypto/_openssl/_libssl_cffi.py

+            tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 16):
+        libssl_path = '/usr/lib/libssl.44.dylib'
    # if we are on macOS 10.15+, we want to strongly version libssl since unversioned libcrypto has a non-stable ABI
    if sys.platform == 'darwin' and list(map(int, platform.mac_ver()[0].split('.')))[1] >= 15 and \


Same as above.

FichteFoll · 2020-06-27T01:02:57Z

oscrypto/_openssl/_libssl_ctypes.py

+            tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 16):
+        libssl_path = '/usr/lib/libssl.44.dylib'
    # if we are on macOS 10.15+, we want to strongly version libssl since unversioned libcrypto has a non-stable ABI
    if sys.platform == 'darwin' and list(map(int, platform.mac_ver()[0].split('.')))[1] >= 15 and \


Same as above.

FichteFoll · 2020-06-27T01:04:03Z

Actually, seeing how frequently this pattern is used, it seems reasonable to factor it out into a function of some sort.

TerminalFi · 2020-06-27T02:46:00Z

Actually, seeing how frequently this pattern is used, it seems reasonable to factor it out into a function of some sort.

Have something in mind? This? Welcomed suggestions, I am on the road currently.

def get_library(library, fallback, unverisoned):
    ...

TerminalFi · 2020-06-28T13:30:40Z

Not sure I like this

def get_library(name, unversioned, fallback):
    library = find_library(name)
    if not library and sys.platform == 'darwin' and tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 16):
        library == fallback
    elif sys.platform == 'darwin' and tuple(map(int,  platform.mac_ver()[0].split('.'))) >= (10, 15) and \
            library == unversioned:
        library = fallback
    return library

in use

libssl_path = _backend_config().get('libssl_path')
if libssl_path is None:
    libssl_path = get_library('ssl', '/usr/lib/libssl.dylib', '/usr/lib/libssl.44.dylib')
if not libssl_path:
    raise LibraryNotFoundError('The library libssl could not be found')

TerminalFi · 2020-06-28T21:25:13Z

@FichteFoll mind helping out with this test issue? I I am guessing I need to fix something in the tests themselves, unless my logic is wrong.

Running tests (via coverage.py)
Traceback (most recent call last):
  File "run.py", line 8, in <module>
    run_task()
  File "/Users/terminal/.projects/oscrypto/dev/_task.py", line 162, in run_task
    result = run(*args, **kwargs)
  File "/Users/terminal/.projects/oscrypto/dev/ci.py", line 49, in run
    tests_result = run_coverage(ci=True)
  File "/Users/terminal/.projects/oscrypto/dev/coverage.py", line 57, in run
    result = run_tests(ci=ci)
  File "/Users/terminal/.projects/oscrypto/dev/tests.py", line 61, in run
    for test_class in test_classes():
  File "/Users/terminal/.projects/oscrypto/tests/__init__.py", line 136, in test_classes
    from .test_kdf import KDFTests
  File "/Users/terminal/.projects/oscrypto/tests/test_kdf.py", line 7, in <module>
    from oscrypto import kdf, _pkcs5
  File "/Users/terminal/.projects/oscrypto/oscrypto/kdf.py", line 9, in <module>
    from .util import rand_bytes
  File "/Users/terminal/.projects/oscrypto/oscrypto/util.py", line 13, in <module>
    from ._mac.util import rand_bytes
  File "/Users/terminal/.projects/oscrypto/oscrypto/_mac/util.py", line 208, in <module>
    from .._openssl._libcrypto import libcrypto
  File "/Users/terminal/.projects/oscrypto/oscrypto/_openssl/_libcrypto.py", line 9, in <module>
    from ._libcrypto_cffi import (
  File "/Users/terminal/.projects/oscrypto/oscrypto/_openssl/_libcrypto_cffi.py", line 7, in <module>
    from ..util import get_library
ImportError: cannot import name 'get_library' from 'oscrypto.util' (/Users/terminal/.projects/oscrypto/oscrypto/util.py)

wbond · 2020-06-28T22:51:11Z

I believe you have an include loop since the root util.py is importing the platform-specific one to get rand_bytes().

This helper function really shouldn’t be part of the public API, so it should go in a file with an _, probably _ffi.py.

FichteFoll

The function made this much better to handle, but there were still some rough edges.

oscrypto/_openssl/_libcrypto_cffi.py

oscrypto/_openssl/_libcrypto_ctypes.py

oscrypto/_openssl/_libssl_cffi.py

oscrypto/_openssl/_libssl_ctypes.py

oscrypto/_ffi.py

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

michaelblyons · 2020-06-30T15:08:17Z

/backlink-ing to wbond/package_control#1477

oscrypto/_ffi.py

wbond · 2020-07-07T15:46:13Z

The error seen with Python 3.7 on Mac can be resolved by rebasing on master, although you may not see it every time the tests are run.

wbond · 2020-07-08T01:39:47Z

Apparently installing PyPy via homebrew is broken, so I'm just going to ignore that error for now.

Thanks for the work on this!

TerminalFi added 3 commits June 26, 2020 12:35

flake8 compliance and some missing indentation

900505b

remove old howsmyssl test

8531e69

wbond requested changes Jun 26, 2020

View reviewed changes

oscrypto/_openssl/_libssl_ctypes.py Outdated Show resolved Hide resolved

oscrypto/_openssl/_libssl_cffi.py Outdated Show resolved Hide resolved

oscrypto/_openssl/_libcrypto_cffi.py Outdated Show resolved Hide resolved

oscrypto/_openssl/_libcrypto_ctypes.py Outdated Show resolved Hide resolved

add check for empty paths macos 10.16+

5b08bc4

FichteFoll reviewed Jun 27, 2020

View reviewed changes

get_library function to wrap library find functions

7f545b7

move get_library to _ffi.py

6a55f1f

FichteFoll suggested changes Jun 30, 2020

View reviewed changes

TerminalFi and others added 5 commits June 30, 2020 08:14

Update oscrypto/_ffi.py

6be9cd9

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

Update oscrypto/_openssl/_libssl_ctypes.py

2a4f65c

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

Update oscrypto/_openssl/_libssl_cffi.py

399adfa

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

Update oscrypto/_openssl/_libcrypto_ctypes.py

40b4e3a

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

Update oscrypto/_openssl/_libcrypto_cffi.py

505e5aa

Co-authored-by: FichteFoll <fichtefoll2@googlemail.com>

fix flake8 and function calls

830f35e

wbond reviewed Jul 7, 2020

View reviewed changes

oscrypto/_ffi.py Outdated Show resolved Hide resolved

TerminalFi added 2 commits July 7, 2020 19:10

update format to % formatting for Py2.X compatibility

c945a37

Merge branch 'master' into fix/macos-bigsur-compatibility

32ffa62

wbond merged commit 6c5abfd into wbond:master Jul 8, 2020

aydumoulin mentioned this pull request Jul 20, 2020

Import of SnowflakeOCSPAsn1Crypto crashes Python snowflakedb/snowflake-sqlalchemy#130

Closed

noah-vetcove mentioned this pull request Jan 11, 2021

Upgrade oscrypto to 1.2.1 abhishek-ram/pyas2-lib#27

Merged

Uh oh!

fixes compatibility with macos big sur. #47

fixes compatibility with macos big sur. #47

Uh oh!

Conversation

TerminalFi commented Jun 26, 2020

Uh oh!

wbond left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FichteFoll Jun 27, 2020

Choose a reason for hiding this comment

Uh oh!

FichteFoll Jun 27, 2020

Choose a reason for hiding this comment

Uh oh!

FichteFoll Jun 27, 2020

Choose a reason for hiding this comment

Uh oh!

FichteFoll Jun 27, 2020

Choose a reason for hiding this comment

Uh oh!

FichteFoll commented Jun 27, 2020

Uh oh!

TerminalFi commented Jun 27, 2020

Uh oh!

TerminalFi commented Jun 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TerminalFi commented Jun 28, 2020

Uh oh!

wbond commented Jun 28, 2020

Uh oh!

FichteFoll left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

michaelblyons commented Jun 30, 2020

Uh oh!

Uh oh!

wbond commented Jul 7, 2020

Uh oh!

wbond commented Jul 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TerminalFi commented Jun 28, 2020 •

edited

Loading