From 251ea57f0508249a3117f20adcf971d102acc308 Mon Sep 17 00:00:00 2001 From: Trishank K Kuppusamy Date: Thu, 4 Jan 2018 14:47:35 -0500 Subject: [PATCH 1/2] Add some filepaths on Fedora where libykcs11 may be found. Signed-off-by: Trishank K Kuppusamy --- trustmanager/yubikey/pkcs11_linux.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trustmanager/yubikey/pkcs11_linux.go b/trustmanager/yubikey/pkcs11_linux.go index 9967e89e1..522fd2550 100644 --- a/trustmanager/yubikey/pkcs11_linux.go +++ b/trustmanager/yubikey/pkcs11_linux.go @@ -4,7 +4,9 @@ package yubikey var possiblePkcs11Libs = []string{ "/usr/lib/libykcs11.so", + "/usr/lib/libykcs11.so.1", // yubico-piv-tool on Fedora installs here "/usr/lib64/libykcs11.so", + "/usr/lib64/libykcs11.so.1", // yubico-piv-tool on Fedora installs here "/usr/lib/x86_64-linux-gnu/libykcs11.so", "/usr/local/lib/libykcs11.so", } From ab433b8cf7ddb3b511d39fb0e7fd7fd326321c32 Mon Sep 17 00:00:00 2001 From: Trishank K Kuppusamy Date: Thu, 1 Feb 2018 14:51:14 -0500 Subject: [PATCH 2/2] gofmt Signed-off-by: Trishank K Kuppusamy --- trustmanager/yubikey/pkcs11_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trustmanager/yubikey/pkcs11_linux.go b/trustmanager/yubikey/pkcs11_linux.go index 522fd2550..836018f00 100644 --- a/trustmanager/yubikey/pkcs11_linux.go +++ b/trustmanager/yubikey/pkcs11_linux.go @@ -4,9 +4,9 @@ package yubikey var possiblePkcs11Libs = []string{ "/usr/lib/libykcs11.so", - "/usr/lib/libykcs11.so.1", // yubico-piv-tool on Fedora installs here + "/usr/lib/libykcs11.so.1", // yubico-piv-tool on Fedora installs here "/usr/lib64/libykcs11.so", - "/usr/lib64/libykcs11.so.1", // yubico-piv-tool on Fedora installs here + "/usr/lib64/libykcs11.so.1", // yubico-piv-tool on Fedora installs here "/usr/lib/x86_64-linux-gnu/libykcs11.so", "/usr/local/lib/libykcs11.so", }