optimize McCipherUtils and McFileUtils