The rest of the PKCS#5, PKCS#8 patch I forgot before :-)