some code cleanup
fix problems reading salt and encdek
add crypto type into ouput
add support for scrypt (Android >= 4.4) encryption