From d2ca58bbf48ba0b27ccc66d306e2f340ade60cca Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 9 Nov 2015 16:46:42 -0800 Subject: [PATCH] use the slots on the yubikey in the following order: 9c, 9e, 9d, 9a Signed-off-by: David Lawrence (github: endophage) --- trustmanager/yubikeystore.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trustmanager/yubikeystore.go b/trustmanager/yubikeystore.go index e44bb2ba98..d7d44fcbba 100644 --- a/trustmanager/yubikeystore.go +++ b/trustmanager/yubikeystore.go @@ -36,7 +36,10 @@ const ( ) // what key mode to use when generating keys -var yubikeyKeymode = KeymodeTouch | KeymodePinOnce +var ( + yubikeyKeymode = KeymodeTouch | KeymodePinOnce + slotIDs = []int{2, 1, 3, 0} +) // SetYubikeyKeyMode - sets the mode when generating yubikey keys. // This is to be used for testing. It does nothing if not building with tag @@ -522,7 +525,7 @@ func getNextEmptySlot(ctx *pkcs11.Ctx, session pkcs11.SessionHandle) ([]byte, er } } } - for i := 0; i < numSlots; i++ { + for _, i := range slotIDs { if !taken[i] { return []byte{byte(i)}, nil }