Make OpenSSL version regexes more robust

wbond · Aug 17, 2023 · d5f3437 · d5f3437
1 parent ebbc944
commit d5f3437
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/oscrypto/_openssl/_libcrypto_cffi.py b/oscrypto/_openssl/_libcrypto_cffi.py
@@ -37,13 +37,13 @@
 
 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)
+ version_match = re.search('(?<=LibreSSL )(\\d+\\.\\d+(\\.\\d+)?)\\b', version_string)
 if not version_match:
  raise LibraryNotFoundError('Error detecting the version of libcrypto')
 version = version_match.group(1)
-version_parts = re.sub('(\\d)([a-z]+)', '\\1.\\2', version).split('.')
+version_parts = re.sub('(\\d+)([a-z]+)', '\\1.\\2', version).split('.')
 version_info = tuple(int(part) if part.isdigit() else part for part in version_parts)
 
 # LibreSSL is compatible with libcrypto from OpenSSL 1.0.1

diff --git a/oscrypto/_openssl/_libcrypto_ctypes.py b/oscrypto/_openssl/_libcrypto_ctypes.py
@@ -40,13 +40,13 @@
 
 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)
+ version_match = re.search('(?<=LibreSSL )(\\d+\\.\\d+(\\.\\d+)?)\\b', version_string)
 if not version_match:
  raise LibraryNotFoundError('Error detecting the version of libcrypto')
 version = version_match.group(1)
-version_parts = re.sub('(\\d)([a-z]+)', '\\1.\\2', version).split('.')
+version_parts = re.sub('(\\d+)([a-z]+)', '\\1.\\2', version).split('.')
 version_info = tuple(int(part) if part.isdigit() else part for part in version_parts)
 
 # LibreSSL is compatible with libcrypto from OpenSSL 1.0.1