Fix ansible-vault cipher_whitelist (#57272)

* Fix ansible-vault cipher_whitelist Fixes: #57271

* Add changelog for #57272
This commit is contained in:
Klaus Frank 2019-06-22 17:14:37 +02:00 committed by Toshio Kuratomi
parent f4ff3ade1f
commit e7356957ee
2 changed files with 4 additions and 1 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- Remove lingering ansible vault cipher (AES) after it beeing removed in #44320

View file

@ -82,7 +82,7 @@ display = Display()
b_HEADER = b'$ANSIBLE_VAULT'
CIPHER_WHITELIST = frozenset((u'AES', u'AES256'))
CIPHER_WHITELIST = frozenset((u'AES256',))
CIPHER_WRITE_WHITELIST = frozenset((u'AES256',))
# See also CIPHER_MAPPING at the bottom of the file which maps cipher strings
# (used in VaultFile header) to a cipher class
@ -288,6 +288,7 @@ def verify_secret_is_not_empty(secret, msg=None):
class VaultSecret:
'''Opaque/abstract objects for a single vault secret. ie, a password or a key.'''
def __init__(self, _bytes=None):
# FIXME: ? that seems wrong... Unset etc?
self._bytes = _bytes