summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJames Tanner <tanner.jc@gmail.com>2014-03-10 16:15:44 -0500
committerJames Cammarata <jimi@sngx.net>2014-03-10 16:15:44 -0500
commit0d6f6ad282fd0d3fb581da9dcbafd33521eb67be (patch)
tree91b006014c58883688ef8524cb04308bd27a39cb /bin
parentba0fec4f4238e381adc5f5a2f286bcd5b32f0586 (diff)
downloadansible-0d6f6ad282fd0d3fb581da9dcbafd33521eb67be.tar.gz
Implement new default cipher class AES256
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ansible-vault8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ansible-vault b/bin/ansible-vault
index 902653d40b..2c8094d13b 100755
--- a/bin/ansible-vault
+++ b/bin/ansible-vault
@@ -52,7 +52,7 @@ def build_option_parser(action):
sys.exit()
# options for all actions
- #parser.add_option('-c', '--cipher', dest='cipher', default="AES", help="cipher to use")
+ #parser.add_option('-c', '--cipher', dest='cipher', default="AES256", help="cipher to use")
parser.add_option('--debug', dest='debug', action="store_true", help="debug")
parser.add_option('--vault-password-file', dest='password_file',
help="vault password file")
@@ -119,7 +119,7 @@ def execute_create(args, options, parser):
else:
password = _read_password(options.password_file)
- cipher = 'AES'
+ cipher = 'AES256'
if hasattr(options, 'cipher'):
cipher = options.cipher
@@ -133,7 +133,7 @@ def execute_decrypt(args, options, parser):
else:
password = _read_password(options.password_file)
- cipher = 'AES'
+ cipher = 'AES256'
if hasattr(options, 'cipher'):
cipher = options.cipher
@@ -169,7 +169,7 @@ def execute_encrypt(args, options, parser):
else:
password = _read_password(options.password_file)
- cipher = 'AES'
+ cipher = 'AES256'
if hasattr(options, 'cipher'):
cipher = options.cipher