Merge branch 'bugfix/gnupg2' into bugfix/autopkgtest-yakkety

1 files changed, 9 insertions, 2 deletions

diff --git a/asserts/gpgkeypairmgr.go b/asserts/gpgkeypairmgr.go
index f186b25acf..30499e6621 100644
--- a/asserts/gpgkeypairmgr.go
+++ b/asserts/gpgkeypairmgr.go
@@ -190,12 +190,13 @@ func (gkm *GPGKeypairManager) Walk(consider func(privk PrivateKey, fingerprint s
	var privKey PrivateKey
	// look for fpr:, uid: lines, order may vary and gpg2.1
	// may springle additional lines in (like gpr:)
+	Loop:
	for k := j + 1; k < n && !strings.HasPrefix(lines[k], "sec:"); k++ {
	switch {
	case strings.HasPrefix(lines[k], "fpr:"):
	fprFields := strings.Split(lines[k], ":")
	if len(fprFields) < 10 {
-	break
+	break Loop
	}
	fpr = fprFields[9]
	if !strings.HasSuffix(fpr, keyID) {
@@ -207,10 +208,16 @@ func (gkm *GPGKeypairManager) Walk(consider func(privk PrivateKey, fingerprint s
	}
	case strings.HasPrefix(lines[k], "uid:"):
	uidFields := strings.Split(lines[k], ":")
+	if len(uidFields) < 10 {
+	break Loop
+	}
	uid = uidFields[9]
-	break
	}
	}
+	// sanity checking
+	if privKey == nil || uid == "" {
+	continue
+	}
	// collected it all
	err = consider(privKey, fpr, uid)
	if err != nil {