1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
nixpkgs/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
danbst a5b8c0c2de salt: 2016.11.5 -> 2017.7.1, patch fix
The libcrypto patch didn't work well with `salt-ssh` (that code failed on
remote machines), so let's make Nix-based library lookup as fallback.

https://github.com/saltstack/salt/issues/43350
2017-09-05 15:54:16 +03:00

15 lines
434 B
Diff

diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
index f827cc6db8..b728595186 100644
--- a/salt/utils/rsax931.py
+++ b/salt/utils/rsax931.py
@@ -47,6 +47,9 @@ def _load_libcrypto():
lib = lib[0] if len(lib) > 0 else None
if lib:
return cdll.LoadLibrary(lib)
+ else:
+ return cdll.LoadLibrary('@libcrypto@')
+
raise OSError('Cannot locate OpenSSL libcrypto')