From 3c2cdea5cc3bbb5895785790d10522f439fdd3ff Mon Sep 17 00:00:00 2001 From: BibMartin <{ID}+{username}@users.noreply.github.com> Date: Wed, 9 Aug 2023 17:55:29 +0200 Subject: [PATCH 1/2] MJ: Fix #75 bug with openssl 3.0.10 --- oscrypto/_openssl/_libcrypto_cffi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscrypto/_openssl/_libcrypto_cffi.py b/oscrypto/_openssl/_libcrypto_cffi.py index 8aed03e..14eb576 100644 --- a/oscrypto/_openssl/_libcrypto_cffi.py +++ b/oscrypto/_openssl/_libcrypto_cffi.py @@ -37,7 +37,7 @@ is_libressl = 'LibreSSL' in version_string -version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string) +version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string) if not version_match: version_match = re.search('(?<=LibreSSL )(\\d\\.\\d(\\.\\d)?)\\b', version_string) if not version_match: From 1103b2ad78a34aafd9d802750a6efef8d43ed2b9 Mon Sep 17 00:00:00 2001 From: BibMartin <{ID}+{username}@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:58:14 +0200 Subject: [PATCH 2/2] MJ: Add fix suggested by @vcunat on _libcrypto_ctypes regex --- oscrypto/_openssl/_libcrypto_ctypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscrypto/_openssl/_libcrypto_ctypes.py b/oscrypto/_openssl/_libcrypto_ctypes.py index e33ebbc..9cb294a 100644 --- a/oscrypto/_openssl/_libcrypto_ctypes.py +++ b/oscrypto/_openssl/_libcrypto_ctypes.py @@ -40,7 +40,7 @@ is_libressl = 'LibreSSL' in version_string -version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string) +version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string) if not version_match: version_match = re.search('(?<=LibreSSL )(\\d\\.\\d(\\.\\d)?)\\b', version_string) if not version_match: