View | Details | Raw Unified | Return to bug 1773 | Differences between
and this patch

Collapse All | Expand All

(-)openssh-7.1p1/ssh-pkcs11.c (-6 / +3 lines)
Lines 481-492 pkcs11_fetch_keys_filter(struct pkcs11_p Link Here
481
			error("C_GetAttributeValue failed: %lu", rv);
481
			error("C_GetAttributeValue failed: %lu", rv);
482
			continue;
482
			continue;
483
		}
483
		}
484
		/*
484
		/* check that none of the attributes are zero length */
485
		 * Allow CKA_ID (always first attribute) to be empty, but
485
		if (attribs[0].ulValueLen == 0 ||
486
		 * ensure that none of the others are zero length.
486
		    attribs[1].ulValueLen == 0 ||
487
		 * XXX assumes CKA_ID is always first.
488
		 */
489
		if (attribs[1].ulValueLen == 0 ||
490
		    attribs[2].ulValueLen == 0) {
487
		    attribs[2].ulValueLen == 0) {
491
			continue;
488
			continue;
492
		}
489
		}

Return to bug 1773