Fixed ssh's pkcs11 usage on macOS

copy (instead of link) our pkcs11 libraries to the default location, which is whitelisted for ssh usage fixes #1008
OpenSC · May 13, 2017 · e23960f · e23960f
1 parent d9d247e
commit e23960f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/MacOSX/opensc-uninstall b/MacOSX/opensc-uninstall
@@ -11,8 +11,9 @@ for file in /Library/OpenSC/bin/*; do
  test -L "/usr/local/bin/$(basename $file)" && rm -f "/usr/local/bin/$(basename $file)"
 done
 
-# Remove symlink for pkcs11
-test -L /usr/lib/opensc-pkcs11.so && rm -f /usr/lib/opensc-pkcs11.so
+# Remove pkcs11 libraries
+rm -f /usr/local/lib/opensc-pkcs11.so
+rm -f /usr/local/lib/onepin-opensc-pkcs11.so
 
 # Remove installed files
 rm -rf /Library/OpenSC

diff --git a/MacOSX/scripts/postinstall b/MacOSX/scripts/postinstall
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-if !([ -e "/usr/local/lib/opensc-pkcs11.so" ])
-then
- ln -s /Library/OpenSC/lib/opensc-pkcs11.so /usr/local/lib/opensc-pkcs11.so
-fi
+cp /Library/OpenSC/lib/opensc-pkcs11.so /usr/local/lib/opensc-pkcs11.so
+cp /Library/OpenSC/lib/onepin-opensc-pkcs11.so /usr/local/lib/onepin-opensc-pkcs11.so
 if [ -e "/Library/OpenSC/etc/opensc.conf.md5" ]
 then
  read cs_fromfile file < "/Library/OpenSC/etc/opensc.conf.md5"