CipherUtils updated