changes to support simple camera->IOCipher storage