Merge "utils: Fix for OpenSSL library name change"

2019-12-10 11:21:59 +00:00
parent 6e9f0f0286 fb24f68a0a
commit c4ecb2b2c6
1 changed files with 6 additions and 1 deletions
--- a/cloudbaseinit/utils/crypt.py
+++ b/cloudbaseinit/utils/crypt.py
@@ -26,7 +26,12 @@ if sys.platform == "win32":
    else:
        clib = ctypes.cdll.ucrtbase

-    openssl = ctypes.cdll.libeay32
+    # Note(mbivolan): The library name has changed in OpenSSL 1.1.0
+    # Keeping the old name for backward compatibility
+    try:
+        openssl = ctypes.cdll.libeay32
+    except Exception:
+        openssl = ctypes.cdll.libcrypto
 else:
    clib = ctypes.CDLL(clib_path)
    openssl_lib_path = ctypes.util.find_library("ssl")