Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed ssh's pkcs11 usage on macOS #1041

Merged
merged 1 commit into from
May 13, 2017
Merged

Fixed ssh's pkcs11 usage on macOS #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
  • Loading branch information
@frankmorgner
frankmorgner committed May 3, 2017
commit ca38fdf312d19f5fea2a60748b3cf5d53dba0668
5 changes: 3 additions & 2 deletions MacOSX/opensc-uninstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions MacOSX/scripts/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down