[us-commits] [ehb54/ultrascan3] bc8f22: Refactor password re-encryption logic