Check-in [fb8686074b]
Overview
SHA1:fb8686074b529279c0c6095b2f340b9616beb821
Date: 2016-03-15 19:53:46
User: rkeene
Comment:Better error handling without a PKCS#11 module
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2017-03-22
21:11
[17d801292a] Leaf: Support wrapping for long lines (user: rkeene, tags: trunk)
2016-03-15
19:53
[fb8686074b] Better error handling without a PKCS#11 module (user: rkeene, tags: trunk)
19:51
[fe9b9c5e48] Updated password saving to be less atomic but more consistently able to preserve ACLs, permissions, etc (user: rkeene, tags: trunk)
Changes

Modified hunter2 from [ec608c91c1] to [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]