cryptfs: Only consider patterns for upgrade conversionstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K

This avoids trying to fix certain PINs and passwords that would be
detected as broken by fix_broken_cm12_pattern().

Jira: OPO-677

Change-Id: I057b0c4231f1fb19b992f379fdbe7e9aa934eafd
(cherry picked from commit ece26f2f8c4df54a41fb2ce3aa829f894c92b691)

1 files changed, 3 insertions, 1 deletions

diff --git a/cryptfs.c b/cryptfs.c
index 92e25d3..0115fa8 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -221,7 +221,9 @@ static int verify_and_update_hw_fde_passwd(char *passwd,
                 }
                 strlcpy(new_passwd, DEFAULT_HEX_PASSWORD, strlen(DEFAULT_HEX_PASSWORD) + 1);
             } else {
-                new_passwd = fix_broken_cm12_pattern(passwd);
+                if (crypt_ftr->crypt_type == CRYPT_TYPE_PATTERN) {
+                    new_passwd = fix_broken_cm12_pattern(passwd);
+                }
                 if (new_passwd == NULL) { // not an old broken pattern
                     new_passwd = (char*)malloc(strlen(passwd) * 2 + 1);
                     if (new_passwd == NULL) {