rpms/opensc
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not fail if both modules are in NSS DB

Browse Source
This commit is contained in:
Jakub Jelen 2018-03-02 18:43:47 +01:00
parent b47baceeba
commit 56a9408e5f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkcs11-switch.sh
View File

@ -8,9 +8,12 @@ OPENSC_NAME="OpenSC PKCS #11 Module"
OPENSC_LIBRARY="opensc-pkcs11.so" OPENSC_LIBRARY="opensc-pkcs11.so"
add_module() { add_module() {
NAME="$1" CURRENT="$1"
LIBRARY="$2" NAME="$2"
modutil -add "$NAME" -dbdir "$NSSDB" -libfile "$LIBRARY" LIBRARY="$3"
if [ ! "$CURRENT" = "opensc coolkey" ]; then
modutil -add "$NAME" -dbdir "$NSSDB" -libfile "$LIBRARY"
fi
} }
remove_module() { remove_module() {
NAME="$1" NAME="$1"
@ -68,10 +71,10 @@ fi
# Do the actual change # Do the actual change
if [ "$TARGET" = "opensc" ]; then if [ "$TARGET" = "opensc" ]; then
add_module "$OPENSC_NAME" "$OPENSC_LIBRARY" add_module "$CURRENT" "$OPENSC_NAME" "$OPENSC_LIBRARY"
remove_module "$COOLKEY_NAME" remove_module "$COOLKEY_NAME"
fi fi
if [ "$TARGET" = "coolkey" ]; then if [ "$TARGET" = "coolkey" ]; then
add_module "$COOLKEY_NAME" "$COOLKEY_LIBRARY" add_module "$CURRENT" "$COOLKEY_NAME" "$COOLKEY_LIBRARY"
remove_module "$OPENSC_NAME" remove_module "$OPENSC_NAME"
fi fi