More Samsung sdcard crypto fixes