Attachment 1812 Details for Bug 1736 – print out key ID for debugging

[patch] print out key ID for debugging

UU (text/plain), 1.40 KB, created by Markus Friedl on 2010-03-19 20:47:55 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2010-03-19 20:47:55 AEDT

Size: 1.40 KB

patch

obsolete

>Index: ssh-pkcs11.c
>===================================================================
>RCS file: /cvs/openssh/ssh-pkcs11.c,v
>retrieving revision 1.5
>diff -u -p -p -u -r1.5 ssh-pkcs11.c
>--- ssh-pkcs11.c	4 Mar 2010 20:48:05 -0000	1.5
>+++ ssh-pkcs11.c	19 Mar 2010 09:43:32 -0000
>@@ -80,6 +80,17 @@ pkcs11_init(int interactive)
> 	return (0);
> }
> 
>+static void
>+pkcs11_printid(const char *msg, const u_char *id, u_int len)
>+{
>+	u_int i;
>+
>+	fprintf(stderr, "%s/%u: ", msg, len);
>+	for (i = 0; i < len; i++)
>+		fprintf(stderr, "%02x", id[i]);
>+	fprintf(stderr, "\n");
>+}
>+
> /*
>  * finalize a provider shared libarary, it's no longer usable.
>  * however, there might still be keys referencing this provider,
>@@ -247,6 +258,7 @@ pkcs11_rsa_private_encrypt(int flen, con
> 	}
> 	key_filter[1].pValue = k11->keyid;
> 	key_filter[1].ulValueLen = k11->keyid_len;
>+pkcs11_printid(__func__, k11->keyid, k11->keyid_len);
> 	if ((rv = f->C_FindObjectsInit(si->session, key_filter, 3)) != CKR_OK) {
> 		error("C_FindObjectsInit failed: %lu", rv);
> 		return (-1);
>@@ -293,6 +305,7 @@ pkcs11_rsa_wrap(struct pkcs11_provider *
> 	k11->keyid_len = keyid_attrib->ulValueLen;
> 	k11->keyid = xmalloc(k11->keyid_len);
> 	memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
>+pkcs11_printid(__func__, k11->keyid, k11->keyid_len);
> 	k11->orig_finish = def->finish;
> 	memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method));
> 	k11->rsa_method.name = "pkcs11";

Actions: View | Diff

Attachments on bug 1736: 1812 | 1813 | 1814 | 1829 | 1835 | 1836 | 1837