Fix AC-699 by using the spawnu interface on pexpect3 and making sure we use the right encoding on passwords passed to the cipher

This commit is contained in:
Matthew Jones
2013-12-20 06:56:17 -05:00
parent 44574de083
commit ca35419dee
2 changed files with 2 additions and 2 deletions

View File

@@ -350,7 +350,7 @@ class Credential(CommonModelNameNotUnique):
# if hit hasn't been specified, then we're just doing a normal save.
for field in self.PASSWORD_FIELDS:
ask = bool(self.kind == 'ssh' and field != 'ssh_key_data')
encrypted = encrypt_field(self, field, ask)
encrypted = encrypt_field(self, field, ask.encode('utf-8'))
setattr(self, field, encrypted)
if field not in update_fields:
update_fields.append(field)