look for SoftHSMv2 as well
use local and quote vars
move local def
Merge pull request #17 from jschlyter/softhsmv2-testing-1.3

Basic SoftHSMv2 support for 1.3