Attachment 2868 Details for Bug 2610 – drop verbosity of pkcs11 "errors"

[patch] drop verbosity of pkcs11 "errors"

openssh_pkcs11_verbose.patch (text/plain), 1.05 KB, created by Jakub Jelen on 2016-09-02 21:48:30 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2016-09-02 21:48:30 AEST

Size: 1.05 KB

patch

obsolete

>diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
>index d1f750d..da68edb 100644
>--- a/ssh-pkcs11.c
>+++ b/ssh-pkcs11.c
>@@ -577,7 +577,7 @@ pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
> 
> 	*keyp = NULL;
> 	if (pkcs11_provider_lookup(provider_id) != NULL) {
>-		error("provider already registered: %s", provider_id);
>+		verbose("%s: provider already registered: %s", __func__, provider_id);
> 		goto fail;
> 	}
> 	/* open shared pkcs11-libarary */
>@@ -622,7 +622,7 @@ pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
> 		goto fail;
> 	}
> 	if (p->nslots == 0) {
>-		error("no slots");
>+		verbose("%s: no slots", __func__);
> 		goto fail;
> 	}
> 	p->slotlist = xcalloc(p->nslots, sizeof(CK_SLOT_ID));
>@@ -663,7 +663,7 @@ pkcs11_add_provider(char *provider_id, char *pin, struct sshkey ***keyp)
> 		p->refcount++;	/* add to provider list */
> 		return (nkeys);
> 	}
>-	error("no keys");
>+	verbose("%s: no keys", __func__);
> 	/* don't add the provider, since it does not have any keys */
> fail:
> 	if (need_finalize && (rv = f->C_Finalize(NULL)) != CKR_OK)

Actions: View | Diff

Attachments on bug 2610: 2868