View | Details | Raw Unified | Return to bug 2610
Collapse All | Expand All

(-)a/ssh-pkcs11.c (-3 / +3 lines)
Lines 577-583 pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp) Link Here
577
577
578
	*keyp = NULL;
578
	*keyp = NULL;
579
	if (pkcs11_provider_lookup(provider_id) != NULL) {
579
	if (pkcs11_provider_lookup(provider_id) != NULL) {
580
		error("provider already registered: %s", provider_id);
580
		verbose("%s: provider already registered: %s", __func__, provider_id);
581
		goto fail;
581
		goto fail;
582
	}
582
	}
583
	/* open shared pkcs11-libarary */
583
	/* open shared pkcs11-libarary */
Lines 622-628 pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp) Link Here
622
		goto fail;
622
		goto fail;
623
	}
623
	}
624
	if (p->nslots == 0) {
624
	if (p->nslots == 0) {
625
		error("no slots");
625
		verbose("%s: no slots", __func__);
626
		goto fail;
626
		goto fail;
627
	}
627
	}
628
	p->slotlist = xcalloc(p->nslots, sizeof(CK_SLOT_ID));
628
	p->slotlist = xcalloc(p->nslots, sizeof(CK_SLOT_ID));
Lines 663-669 pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp) Link Here
663
		p->refcount++;	/* add to provider list */
663
		p->refcount++;	/* add to provider list */
664
		return (nkeys);
664
		return (nkeys);
665
	}
665
	}
666
	error("no keys");
666
	verbose("%s: no keys", __func__);
667
	/* don't add the provider, since it does not have any keys */
667
	/* don't add the provider, since it does not have any keys */
668
fail:
668
fail:
669
	if (need_finalize && (rv = f->C_Finalize(NULL)) != CKR_OK)
669
	if (need_finalize && (rv = f->C_Finalize(NULL)) != CKR_OK)

Return to bug 2610