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

Collapse All | Expand All

(-)ssh-pkcs11.c (+13 lines)
Lines 80-85 pkcs11_init(int interactive) Link Here
80
	return (0);
80
	return (0);
81
}
81
}
82
82
83
static void
84
pkcs11_printid(const char *msg, const u_char *id, u_int len)
85
{
86
	u_int i;
87
88
	fprintf(stderr, "%s/%u: ", msg, len);
89
	for (i = 0; i < len; i++)
90
		fprintf(stderr, "%02x", id[i]);
91
	fprintf(stderr, "\n");
92
}
93
83
/*
94
/*
84
 * finalize a provider shared libarary, it's no longer usable.
95
 * finalize a provider shared libarary, it's no longer usable.
85
 * however, there might still be keys referencing this provider,
96
 * however, there might still be keys referencing this provider,
Lines 247-252 pkcs11_rsa_private_encrypt(int flen, con Link Here
247
	}
258
	}
248
	key_filter[1].pValue = k11->keyid;
259
	key_filter[1].pValue = k11->keyid;
249
	key_filter[1].ulValueLen = k11->keyid_len;
260
	key_filter[1].ulValueLen = k11->keyid_len;
261
pkcs11_printid(__func__, k11->keyid, k11->keyid_len);
250
	if ((rv = f->C_FindObjectsInit(si->session, key_filter, 3)) != CKR_OK) {
262
	if ((rv = f->C_FindObjectsInit(si->session, key_filter, 3)) != CKR_OK) {
251
		error("C_FindObjectsInit failed: %lu", rv);
263
		error("C_FindObjectsInit failed: %lu", rv);
252
		return (-1);
264
		return (-1);
Lines 293-298 pkcs11_rsa_wrap(struct pkcs11_provider * Link Here
293
	k11->keyid_len = keyid_attrib->ulValueLen;
305
	k11->keyid_len = keyid_attrib->ulValueLen;
294
	k11->keyid = xmalloc(k11->keyid_len);
306
	k11->keyid = xmalloc(k11->keyid_len);
295
	memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
307
	memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
308
pkcs11_printid(__func__, k11->keyid, k11->keyid_len);
296
	k11->orig_finish = def->finish;
309
	k11->orig_finish = def->finish;
297
	memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method));
310
	memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method));
298
	k11->rsa_method.name = "pkcs11";
311
	k11->rsa_method.name = "pkcs11";

Return to bug 1736