lib/pubkey2fp.c: style tweak.
unpack: make sure to remove only on-disk files if file type does not match.

Added another ATF test-case to make sure it works properly.