Diff

Differences From Artifact [ec608c91c1]:

To Artifact [6da8c360ca]:


301
302
303
304
305
306
307
308
309
310

311
312
313
314
315
316
317
	set fd [open $fileName w 0600]
	puts $fd [join $output "\n"]
	close $fd
}

proc _listCertificates {} {
	if {![info exists ::env(PKCS11MODULE)]} {
		return [list]
	}


	set ::env(CACKEY_NO_EXTRA_CERTS) 1

	set handle [::pki::pkcs11::loadmodule $::env(PKCS11MODULE)]

	set slotInfo [list]
	foreach slot [::pki::pkcs11::listslots $handle] {
		set slotID [lindex $slot 0]







|


>







301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
	set fd [open $fileName w 0600]
	puts $fd [join $output "\n"]
	close $fd
}

proc _listCertificates {} {
	if {![info exists ::env(PKCS11MODULE)]} {
		return -code error "ERROR: PKCS11MODULE environment variable is not set to your PKCS11 module"
	}

	# Hardcode some PKCS11 module workarounds
	set ::env(CACKEY_NO_EXTRA_CERTS) 1

	set handle [::pki::pkcs11::loadmodule $::env(PKCS11MODULE)]

	set slotInfo [list]
	foreach slot [::pki::pkcs11::listslots $handle] {
		set slotID [lindex $slot 0]