Change PKCS#12 key derivation routines to cope with