Browse Source

Merge "Skip cryptsetup password quality checking" into stable/stein

changes/82/713082/1 2.8.4
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
fd6425b2ee
  1. 1
      os_brick/encryptors/luks.py
  2. 1
      os_brick/tests/encryptors/test_luks.py

1
os_brick/encryptors/luks.py

@ -119,6 +119,7 @@ class LuksEncryptor(cryptsetup.CryptsetupEncryptor):
# Enter new passphrase for key slot:
# Verify passphrase:
self._execute('cryptsetup', 'luksAddKey', self.dev_path,
'--force-password',
process_input=''.join([mangled_passphrase, '\n',
passphrase, '\n', passphrase]),
run_as_root=True, check_exit_code=True,

1
os_brick/tests/encryptors/test_luks.py

@ -227,6 +227,7 @@ class LuksEncryptorTestCase(test_cryptsetup.CryptsetupEncryptorTestCase):
root_helper=self.root_helper, run_as_root=True,
check_exit_code=[0, 4], attempts=3),
mock.call('cryptsetup', 'luksAddKey', self.dev_path,
'--force-password',
process_input=''.join([fake_key_mangled,
'\n', fake_key,
'\n', fake_key]),

Loading…
Cancel
Save