Streamlining pk3/pkm crypto