From 587906e6c6ea2673171bfe70e4d256894392795e Mon Sep 17 00:00:00 2001
From: Ying Li <ying.li@docker.com>
Date: Fri, 13 Nov 2015 00:08:53 -0800
Subject: [PATCH] More defensive coding around listing our keys in the yubikey.

Signed-off-by: Ying Li <ying.li@docker.com>
---
 .DS_Store                            | Bin 6148 -> 0 bytes
 trustmanager/yubikey/yubikeystore.go |   6 ++++++
 2 files changed, 6 insertions(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index c5a1abbe51c28373d2ba531833091a7a8c9201cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z-O8rg|`fqTX`z(nCwd9u2jgyc8<!L8T@%*oCkuO=^)+$UFG|9QrW6
zfbZeV?zXg4Pl8C93A5kq>`a#VHtc2@W4t=(lo+!aV-_f4CJ)Uwg5#(Qk})1cj_-(j
zei-@C`}BJY(d77#4B*;jna>21{&05vLJ=p$;s?)Ub1SQBR(>6y&HPoP8x0$Ymki>n
z*S}Cb(FuHG*S(}WvCpF@oZ6n>6v41<Z=Xam@q`TeGpUy?Av@8q8VzJ8ZreNcesBxX
zbx#IO5er|0BDu5j__Xca(Wq1`IHgi?TyRE}3fPC`qw(0X_7BR(XDvCpe|UU)etCV<
zd~^6Tm24TDz&jYG^xH;XhLOAh&m?*hMMw+~1H`}*GGMkkYhwv(qmqaLV&HcS;Qru%
zBDw}sjcV(F27e!MJcoz^Hr^!=9fPjHR3nUlaGeUMQ@OcfaGef*$Hch?Q;j;EaWyl%
z$IQ&l4TY=O!SASW#$Aon5(C7*JOf$XwekEv{rUbspF}-kfEZXR26(R4s8yjPbG9xN
whi9z=dJT$#ajC{>3K;4rhFCm`_du0^-$4V=HJEAy4+#ATC>p3C2L6<RFY!rQ%K!iX

diff --git a/trustmanager/yubikey/yubikeystore.go b/trustmanager/yubikey/yubikeystore.go
index 3eacbf215d..787a6ad001 100644
--- a/trustmanager/yubikey/yubikeystore.go
+++ b/trustmanager/yubikey/yubikeystore.go
@@ -483,6 +483,12 @@ func yubiListKeys(ctx IPKCS11Ctx, session pkcs11.SessionHandle) (keys map[string
 				}
 			}
 		}
+
+		// we found nothing
+		if cert == nil {
+			continue
+		}
+
 		var ecdsaPubKey *ecdsa.PublicKey
 		switch cert.PublicKeyAlgorithm {
 		case x509.ECDSA: